diff --git a/qrenderdoc/Code/Resources.h b/qrenderdoc/Code/Resources.h
index 918b258f5..d6581e52d 100644
--- a/qrenderdoc/Code/Resources.h
+++ b/qrenderdoc/Code/Resources.h
@@ -74,9 +74,11 @@
   RESOURCE_DEF(page_white_link, "page_white_link.png")                  \
   RESOURCE_DEF(page_white_stack, "page_white_stack.png")                \
   RESOURCE_DEF(paste, "paste.png")                                      \
+  RESOURCE_DEF(pixel_history, "pixel_history.png")                      \
   RESOURCE_DEF(plugin, "plugin.png")                                    \
   RESOURCE_DEF(plugin_add, "plugin_add.png")                            \
   RESOURCE_DEF(save, "save.png")                                        \
+  RESOURCE_DEF(text_add, "text_add.png")                                \
   RESOURCE_DEF(tick, "tick.png")                                        \
   RESOURCE_DEF(time, "time.png")                                        \
   RESOURCE_DEF(timeline_marker, "timeline_marker.png")                  \
diff --git a/qrenderdoc/Resources/pixel_history.png b/qrenderdoc/Resources/pixel_history.png
new file mode 100644
index 000000000..f40e39972
Binary files /dev/null and b/qrenderdoc/Resources/pixel_history.png differ
diff --git a/qrenderdoc/Resources/pixel_history@2x.png b/qrenderdoc/Resources/pixel_history@2x.png
new file mode 100644
index 000000000..ce59927ce
Binary files /dev/null and b/qrenderdoc/Resources/pixel_history@2x.png differ
diff --git a/qrenderdoc/Resources/resources.qrc b/qrenderdoc/Resources/resources.qrc
index 0a044030c..2db980e03 100644
--- a/qrenderdoc/Resources/resources.qrc
+++ b/qrenderdoc/Resources/resources.qrc
@@ -105,12 +105,16 @@
         <file>page_white_stack@2x.png</file>
         <file>paste.png</file>
         <file>paste@2x.png</file>
+        <file>pixel_history.png</file>
+        <file>pixel_history@2x.png</file>
         <file>plugin.png</file>
         <file>plugin@2x.png</file>
         <file>plugin_add.png</file>
         <file>plugin_add@2x.png</file>
         <file>save.png</file>
         <file>save@2x.png</file>
+        <file>text_add.png</file>
+        <file>text_add@2x.png</file>
         <file>tick.png</file>
         <file>tick@2x.png</file>
         <file>time.png</file>
diff --git a/qrenderdoc/Resources/text_add.png b/qrenderdoc/Resources/text_add.png
new file mode 100644
index 000000000..2a397b42f
Binary files /dev/null and b/qrenderdoc/Resources/text_add.png differ
diff --git a/qrenderdoc/Resources/text_add@2x.png b/qrenderdoc/Resources/text_add@2x.png
new file mode 100644
index 000000000..a44c97ae8
Binary files /dev/null and b/qrenderdoc/Resources/text_add@2x.png differ
diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp
index 53c6d9ee8..1a7f3b8f6 100644
--- a/qrenderdoc/Windows/PixelHistoryView.cpp
+++ b/qrenderdoc/Windows/PixelHistoryView.cpp
@@ -27,6 +27,7 @@
 #include <math.h>
 #include <QAction>
 #include <QMenu>
+#include "Code/Resources.h"
 #include "toolwindowmanager/ToolWindowManager.h"
 #include "ui_PixelHistoryView.h"
 
@@ -838,6 +839,8 @@ void PixelHistoryView::on_events_customContextMenuRequested(const QPoint &pos)
 
   QAction jumpAction(tr("&Go to primitive %1 at Event %2").arg(tag.primitive).arg(tag.eventId), this);
 
+  jumpAction.setIcon(Icons::find());
+
   QString debugText;
 
   if(tag.primitive == ~0U)
@@ -858,6 +861,8 @@ void PixelHistoryView::on_events_customContextMenuRequested(const QPoint &pos)
 
   QAction debugAction(debugText, this);
 
+  debugAction.setIcon(Icons::wrench());
+
   contextMenu.addAction(&debugAction);
 
   if(!m_Ctx.APIProps().shaderDebugging)
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index be08fc2fb..ab7ad2f44 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -1212,6 +1212,10 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
         <property name="text">
          <string>History</string>
         </property>
+        <property name="icon">
+         <iconset resource="../../Resources/resources.qrc">
+          <normaloff>:/pixel_history.png</normaloff>:/pixel_history.png</iconset>
+        </property>
        </widget>
       </item>
       <item row="1" column="1">
@@ -1219,6 +1223,10 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
         <property name="text">
          <string>Debug</string>
         </property>
+        <property name="icon">
+         <iconset resource="../../Resources/resources.qrc">
+          <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
+        </property>
        </widget>
       </item>
      </layout>
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index e904cfbd8..87a05af5c 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -1930,8 +1930,12 @@ IF %ERRORLEVEL% NEQ 0 (echo ====================================================
     <Image Include="Resources\control_sample_blue.png" />
     <Image Include="Resources\control_start_blue%402x.png" />
     <Image Include="Resources\control_start_blue.png" />
+    <Image Include="Resources\copy%402x.png" />
+    <Image Include="Resources\copy.png" />
     <Image Include="Resources\cross%402x.png" />
     <Image Include="Resources\cross.png" />
+    <Image Include="Resources\cut%402x.png" />
+    <Image Include="Resources\cut.png" />
     <Image Include="Resources\del%402x.png" />
     <Image Include="Resources\del.png" />
     <Image Include="Resources\disconnect%402x.png" />
@@ -1969,10 +1973,18 @@ IF %ERRORLEVEL% NEQ 0 (echo ====================================================
     <Image Include="Resources\page_white_link.png" />
     <Image Include="Resources\page_white_stack%402x.png" />
     <Image Include="Resources\page_white_stack.png" />
+    <Image Include="Resources\paste%402x.png" />
+    <Image Include="Resources\paste.png" />
+    <Image Include="Resources\pixel_history%402x.png" />
+    <Image Include="Resources\pixel_history.png" />
+    <Image Include="Resources\plugin%402x.png" />
+    <Image Include="Resources\plugin.png" />
     <Image Include="Resources\plugin_add%402x.png" />
     <Image Include="Resources\plugin_add.png" />
     <Image Include="Resources\save%402x.png" />
     <Image Include="Resources\save.png" />
+    <Image Include="Resources\text_add%402x.png" />
+    <Image Include="Resources\text_add.png" />
     <Image Include="Resources\tick%402x.png" />
     <Image Include="Resources\tick.png" />
     <Image Include="Resources\time%402x.png" />
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters
index 1a9856098..4e828851d 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj.filters
+++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters
@@ -1846,6 +1846,42 @@
     <Image Include="Resources\arrow_refresh.png">
       <Filter>Resources\Files</Filter>
     </Image>
+    <Image Include="Resources\copy.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\copy%402x.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\cut.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\cut%402x.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\paste.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\paste%402x.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\plugin.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\plugin%402x.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\text_add.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\text_add%402x.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\pixel_history.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
+    <Image Include="Resources\pixel_history%402x.png">
+      <Filter>Resources\Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="python36.natvis" />