diff --git a/docs/how/how_debug_shader.rst b/docs/how/how_debug_shader.rst
index c8da855d2..294b3415f 100644
--- a/docs/how/how_debug_shader.rst
+++ b/docs/how/how_debug_shader.rst
@@ -72,6 +72,14 @@ The keyboard shortcuts for these controls are :kbd:`F5` and :kbd:`Shift-F5` resp
 
 You can set a breakpoint by pressing :kbd:`F9` (this will also remove a breakpoint that is already there). When running in each direction or to cursor (see below) if execution hits a breakpoint it will stop.
 
+.. |runsample| image:: ../imgs/icons/runsample.png
+
+This button will run to the next texture load, gather or sample operation, and stop as if a breakpoint had been placed on that instruction.
+
+.. |runnaninf| image:: ../imgs/icons/runnaninf.png
+
+This button will run to the next operation that generates either a NaN or infinity value instead of a floating point value. This will not apply to operations that produce integer results which may be NaN/infinity when interpreted as float.
+
 .. |stepnext| image:: ../imgs/icons/stepnext.png
 .. |stepprev| image:: ../imgs/icons/stepprev.png
 
diff --git a/docs/imgs/icons/runnaninf.png b/docs/imgs/icons/runnaninf.png
new file mode 100644
index 000000000..e99310424
Binary files /dev/null and b/docs/imgs/icons/runnaninf.png differ
diff --git a/docs/imgs/icons/runsample.png b/docs/imgs/icons/runsample.png
new file mode 100644
index 000000000..99d324fca
Binary files /dev/null and b/docs/imgs/icons/runsample.png differ