22 files changed, 30 insertions, 27 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index a2bb82b7..5c33aba9 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -1020,9 +1020,8 @@ void CMainFrame::updateActionFilterEnableState()
 
 void CMainFrame::updateActionPreviewVariantsState(bool isFiltered)
 {
-    m_ui->actionPreview->setIcon(QIcon(isFiltered
-                                       ? QStringLiteral(":/images/playplayback-variant.png")
-                                       : QStringLiteral(":/images/playback_tools_low-03.png")));
+    m_ui->actionPreview->setIcon(QIcon(isFiltered ? QStringLiteral(":/images/preview-variants.png")
+                                                  : QStringLiteral(":/images/preview.png")));
 }
 
 void CMainFrame::OnPlaybackPreviewRemote()
diff --git a/src/Authoring/Studio/MainFrm.ui b/src/Authoring/Studio/MainFrm.ui
index bea7631d..edce9819 100644
--- a/src/Authoring/Studio/MainFrm.ui
+++ b/src/Authoring/Studio/MainFrm.ui
@@ -778,7 +778,9 @@ Project palette using Import functionality.</string>
   <action name="actionPreview">
    <property name="icon">
     <iconset resource="images.qrc">
-     <normaloff>:/images/playback_tools_low-03.png</normaloff>:/images/playback_tools_low-03.png</iconset>
+     <normaloff>:/images/preview.png</normaloff>
+     <disabledoff>:/images/preview-disabled.png</disabledoff>
+     <disabledon>:/images/preview-disabled.png</disabledon>:/images/preview.png</iconset>
    </property>
    <property name="text">
     <string>Preview</string>
@@ -882,9 +884,9 @@ Project palette using Import functionality.</string>
   <action name="actionRemote_Preview">
    <property name="icon">
     <iconset>
-     <normalon>:/images/remote.png</normalon>
-     <disabledoff>:/images/remote-disabled.png</disabledoff>
-     <disabledon>:/images/remote-disabled.png</disabledon>
+     <normalon>:/images/preview-remote.png</normalon>
+     <disabledoff>:/images/preview-remote-disabled.png</disabledoff>
+     <disabledon>:/images/preview-remote-disabled.png</disabledon>
     </iconset>
    </property>
    <property name="text">
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
index c1972901..a2e3c345 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
@@ -54,16 +54,16 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     // create icons
     static const QIcon iconLayer = QIcon(":/images/Objects-Layer-Normal.png");
     static const QIcon iconDelete = QIcon(":/images/Action-Trash-Normal.png");
-    static const QIcon iconFirst = QIcon(":/images/playback_tools_low-00.png");
-    static const QIcon iconLast = QIcon(":/images/playback_tools_low-04.png");
+    static const QIcon iconFirst = QIcon(":/images/playback_tools_first.png");
+    static const QIcon iconLast = QIcon(":/images/playback_tools_last.png");
     static const QIcon iconZoomIn = QIcon(":/images/zoom_in.png");
     static const QIcon iconZoomOut = QIcon(":/images/zoom_out.png");
     m_iconTimebarTextsActive = QIcon(":/images/timeline_text_shown.png");
     m_iconTimebarTextsInactive = QIcon(":/images/timeline_text_hidden.png");
     m_iconDiActive = QIcon(":/images/Objects-DataInput-Active.png");
     m_iconDiInactive = QIcon(":/images/Objects-DataInput-Inactive.png");
-    m_iconStop = QIcon(":/images/playback_tools_low-01.png");
-    m_iconPlay = QIcon(":/images/playback_tools_low-02.png");
+    m_iconStop = QIcon(":/images/playback_tools_stop.png");
+    m_iconPlay = QIcon(":/images/playback_tools_play.png");
 
     // create actions
     QString ctrlKey(QStringLiteral("Ctrl+"));
diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc
index 3e1e4192..93b4e9f1 100644
--- a/src/Authoring/Studio/images.qrc
+++ b/src/Authoring/Studio/images.qrc
@@ -181,11 +181,24 @@
         <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/playback_tools_low-04.png</file>
+        <file>images/playback_tools_first.png</file>
+        <file>images/playback_tools_first@2x.png</file>
+        <file>images/playback_tools_last.png</file>
+        <file>images/playback_tools_last@2x.png</file>
+        <file>images/playback_tools_play.png</file>
+        <file>images/playback_tools_play@2x.png</file>
+        <file>images/playback_tools_stop.png</file>
+        <file>images/playback_tools_stop@2x.png</file>
+        <file>images/preview.png</file>
+        <file>images/preview@2x.png</file>
+        <file>images/preview-disabled.png</file>
+        <file>images/preview-disabled@2x.png</file>
+        <file>images/preview-variants.png</file>
+        <file>images/preview-variants@2x.png</file>
+        <file>images/preview-remote.png</file>
+        <file>images/preview-remote@2x.png</file>
+        <file>images/preview-remote-disabled.png</file>
+        <file>images/preview-remote-disabled@2x.png</file>
         <file>images/Toolbar-00.png</file>
         <file>images/Toolbar-01.png</file>
         <file>images/Toolbar-02.png</file>
@@ -216,9 +229,6 @@
         <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>
@@ -229,7 +239,6 @@
         <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/Objects-edit-disabled.png</file>
         <file>images/Objects-edit-disabled@2x.png</file>
         <file>images/Objects-edit-normal.png</file>
@@ -253,10 +262,6 @@
         <file>images/zoom_out@2x.png</file>
         <file>images/zoom_in.png</file>
         <file>images/zoom_in@2x.png</file>
-        <file>images/remote.png</file>
-        <file>images/remote@2x.png</file>
-        <file>images/remote-disabled.png</file>
-        <file>images/remote-disabled@2x.png</file>
         <file>images/Assets-Model.png</file>
         <file>images/Assets-Model@2x.png</file>
         <file>images/presentation_edit.png</file>
@@ -286,7 +291,6 @@
         <file>images/matdef-active@2x.png</file>
         <file>images/matdef-disabled.png</file>
         <file>images/matdef-disabled@2x.png</file>
-        <file>images/playback_tools_low-04@2x.png</file>
         <file>images/Action-Action@2x.png</file>
         <file>images/Action-ChildAction@2x.png</file>
         <file>images/Action-ChildMasterAction@2x.png</file>
@@ -313,8 +317,6 @@
         <file>images/filter@2x.png</file>
         <file>images/filter-disabled.png</file>
         <file>images/filter-disabled@2x.png</file>
-        <file>images/playback-variant@2x.png</file>
-        <file>images/playplayback-variant.png</file>
     </qresource>
     <qresource prefix="/startup">
         <file alias="open_dialog.png">images/open_dialog.png</file>
diff --git a/src/Authoring/Studio/images/playback_tools_low-00.png b/src/Authoring/Studio/images/playback_tools_first.png
index d7cae98d..d7cae98d 100644
--- a/src/Authoring/Studio/images/playback_tools_low-00.png
+++ b/src/Authoring/Studio/images/playback_tools_first.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-00@2x.png b/src/Authoring/Studio/images/playback_tools_first@2x.png
index 88d6cf17..88d6cf17 100644
--- a/src/Authoring/Studio/images/playback_tools_low-00@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_first@2x.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-04.png b/src/Authoring/Studio/images/playback_tools_last.png
index 3819e1e3..3819e1e3 100644
--- a/src/Authoring/Studio/images/playback_tools_low-04.png
+++ b/src/Authoring/Studio/images/playback_tools_last.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-04@2x.png b/src/Authoring/Studio/images/playback_tools_last@2x.png
index 0f74d37e..0f74d37e 100644
--- a/src/Authoring/Studio/images/playback_tools_low-04@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_last@2x.png
diff --git a/src/Authoring/Studio/images/playback_tools_play.png b/src/Authoring/Studio/images/playback_tools_play.png
new file mode 100644
index 00000000..471b2573
--- /dev/null
+++ b/src/Authoring/Studio/images/playback_tools_play.png
diff --git a/src/Authoring/Studio/images/playback_tools_play@2x.png b/src/Authoring/Studio/images/playback_tools_play@2x.png
new file mode 100644
index 00000000..02370d25
--- /dev/null
+++ b/src/Authoring/Studio/images/playback_tools_play@2x.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-01.png b/src/Authoring/Studio/images/playback_tools_stop.png
index bf4d7f59..bf4d7f59 100644
--- a/src/Authoring/Studio/images/playback_tools_low-01.png
+++ b/src/Authoring/Studio/images/playback_tools_stop.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-01@2x.png b/src/Authoring/Studio/images/playback_tools_stop@2x.png
index 8230c6e8..8230c6e8 100644
--- a/src/Authoring/Studio/images/playback_tools_low-01@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_stop@2x.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-02.png b/src/Authoring/Studio/images/preview-disabled.png
index c4effffc..c4effffc 100644
--- a/src/Authoring/Studio/images/playback_tools_low-02.png
+++ b/src/Authoring/Studio/images/preview-disabled.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-02@2x.png b/src/Authoring/Studio/images/preview-disabled@2x.png
index 7713f19f..7713f19f 100644
--- a/src/Authoring/Studio/images/playback_tools_low-02@2x.png
+++ b/src/Authoring/Studio/images/preview-disabled@2x.png
diff --git a/src/Authoring/Studio/images/remote-disabled.png b/src/Authoring/Studio/images/preview-remote-disabled.png
index 0da8dac9..0da8dac9 100644
--- a/src/Authoring/Studio/images/remote-disabled.png
+++ b/src/Authoring/Studio/images/preview-remote-disabled.png
diff --git a/src/Authoring/Studio/images/remote-disabled@2x.png b/src/Authoring/Studio/images/preview-remote-disabled@2x.png
index dba26e55..dba26e55 100644
--- a/src/Authoring/Studio/images/remote-disabled@2x.png
+++ b/src/Authoring/Studio/images/preview-remote-disabled@2x.png
diff --git a/src/Authoring/Studio/images/remote.png b/src/Authoring/Studio/images/preview-remote.png
index 70e10906..70e10906 100644
--- a/src/Authoring/Studio/images/remote.png
+++ b/src/Authoring/Studio/images/preview-remote.png
diff --git a/src/Authoring/Studio/images/remote@2x.png b/src/Authoring/Studio/images/preview-remote@2x.png
index 21f48873..21f48873 100644
--- a/src/Authoring/Studio/images/remote@2x.png
+++ b/src/Authoring/Studio/images/preview-remote@2x.png
diff --git a/src/Authoring/Studio/images/playplayback-variant.png b/src/Authoring/Studio/images/preview-variants.png
index 62c3e2ff..62c3e2ff 100644
--- a/src/Authoring/Studio/images/playplayback-variant.png
+++ b/src/Authoring/Studio/images/preview-variants.png
diff --git a/src/Authoring/Studio/images/playback-variant@2x.png b/src/Authoring/Studio/images/preview-variants@2x.png
index ae5a9534..ae5a9534 100644
--- a/src/Authoring/Studio/images/playback-variant@2x.png
+++ b/src/Authoring/Studio/images/preview-variants@2x.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-03.png b/src/Authoring/Studio/images/preview.png
index 9c647a4e..9c647a4e 100644
--- a/src/Authoring/Studio/images/playback_tools_low-03.png
+++ b/src/Authoring/Studio/images/preview.png
diff --git a/src/Authoring/Studio/images/playback_tools_low-03@2x.png b/src/Authoring/Studio/images/preview@2x.png
index d2a02f2a..d2a02f2a 100644
--- a/src/Authoring/Studio/images/playback_tools_low-03@2x.png
+++ b/src/Authoring/Studio/images/preview@2x.png