diff --git a/doc/source/dev/states.rst b/doc/source/dev/states.rst
index b23a1f080b..9ebe6951d9 100644
--- a/doc/source/dev/states.rst
+++ b/doc/source/dev/states.rst
@@ -11,7 +11,7 @@ The diagram below shows the provisioning states that an Ironic node goes
 through during the lifetime of a node. The diagram also depicts the events
 that transition the node to different states.
 
-.. figure:: ../images/states.png
+.. figure:: ../images/states.svg
    :width: 660px
    :align: left
    :alt: Ironic state transitions
diff --git a/doc/source/images/states.png b/doc/source/images/states.png
deleted file mode 100644
index 54b8395a0d..0000000000
Binary files a/doc/source/images/states.png and /dev/null differ
diff --git a/doc/source/images/states.svg b/doc/source/images/states.svg
new file mode 100644
index 0000000000..dc3c8d830b
--- /dev/null
+++ b/doc/source/images/states.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.36.0 (20140111.2315)
+ -->
+<!-- Title: Ironic states Pages: 1 -->
+<svg width="1280pt" height="513pt"
+ viewBox="0.00 0.00 1280.00 513.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 509)">
+<title>Ironic states</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-509 1276,-509 1276,4 -4,4"/>
+<!-- manageable -->
+<g id="node1" class="node"><title>manageable</title>
+<ellipse fill="none" stroke="black" cx="42" cy="-108" rx="42.1875" ry="18"/>
+<text text-anchor="middle" x="42" y="-105.2" font-family="Times,serif" font-size="11.00">manageable</text>
+</g>
+<!-- cleaning -->
+<g id="node2" class="node"><title>cleaning</title>
+<ellipse fill="none" stroke="black" cx="220" cy="-180" rx="32.4445" ry="18"/>
+<text text-anchor="middle" x="220" y="-177.2" font-family="Times,serif" font-size="11.00">cleaning</text>
+</g>
+<!-- manageable&#45;&gt;cleaning -->
+<g id="edge1" class="edge"><title>manageable&#45;&gt;cleaning</title>
+<path fill="none" stroke="black" d="M69.452,-121.736C79.5312,-126.775 91.1929,-132.373 102,-137 128.459,-148.328 159.006,-159.492 182.25,-167.604"/>
+<polygon fill="black" stroke="black" points="181.138,-170.923 191.732,-170.886 183.427,-164.308 181.138,-170.923"/>
+<text text-anchor="middle" x="133" y="-163.8" font-family="Times,serif" font-size="14.00">on_provide</text>
+</g>
+<!-- inspecting -->
+<g id="node3" class="node"><title>inspecting</title>
+<ellipse fill="none" stroke="black" cx="220" cy="-69" rx="37.0671" ry="18"/>
+<text text-anchor="middle" x="220" y="-66.2" font-family="Times,serif" font-size="11.00">inspecting</text>
+</g>
+<!-- manageable&#45;&gt;inspecting -->
+<g id="edge2" class="edge"><title>manageable&#45;&gt;inspecting</title>
+<path fill="none" stroke="black" d="M79.1646,-99.2829C86.7039,-97.5038 94.6058,-95.667 102,-94 126.227,-88.538 153.345,-82.7247 175.369,-78.0797"/>
+<polygon fill="black" stroke="black" points="176.352,-81.4496 185.418,-75.9667 174.912,-74.5994 176.352,-81.4496"/>
+<text text-anchor="middle" x="133" y="-97.8" font-family="Times,serif" font-size="14.00">on_inspect</text>
+</g>
+<!-- available -->
+<g id="node4" class="node"><title>available</title>
+<ellipse fill="none" stroke="black" cx="401" cy="-249" rx="34.054" ry="18"/>
+<text text-anchor="middle" x="401" y="-246.2" font-family="Times,serif" font-size="11.00">available</text>
+</g>
+<!-- cleaning&#45;&gt;available -->
+<g id="edge18" class="edge"><title>cleaning&#45;&gt;available</title>
+<path fill="none" stroke="black" d="M248.677,-188.844C272.134,-196.525 306.555,-208.236 336,-220 345.77,-223.903 356.222,-228.468 365.787,-232.806"/>
+<polygon fill="black" stroke="black" points="364.449,-236.043 374.998,-237.035 367.37,-229.682 364.449,-236.043"/>
+<text text-anchor="middle" x="306" y="-223.8" font-family="Times,serif" font-size="14.00">on_done</text>
+</g>
+<!-- clean failed -->
+<g id="node11" class="node"><title>clean failed</title>
+<ellipse fill="none" stroke="black" cx="401" cy="-131" rx="41.4846" ry="18"/>
+<text text-anchor="middle" x="401" y="-128.2" font-family="Times,serif" font-size="11.00" fill="red">clean failed</text>
+</g>
+<!-- cleaning&#45;&gt;clean failed -->
+<g id="edge19" class="edge"><title>cleaning&#45;&gt;clean failed</title>
+<path fill="none" stroke="black" d="M245.273,-168.683C254.717,-164.59 265.721,-160.195 276,-157 300.609,-149.35 328.666,-143.257 351.859,-138.897"/>
+<polygon fill="black" stroke="black" points="352.603,-142.319 361.81,-137.076 351.343,-135.433 352.603,-142.319"/>
+<text text-anchor="middle" x="306" y="-160.8" font-family="Times,serif" font-size="14.00" fill="red">on_fail</text>
+</g>
+<!-- inspecting&#45;&gt;manageable -->
+<g id="edge23" class="edge"><title>inspecting&#45;&gt;manageable</title>
+<path fill="none" stroke="black" d="M186.821,-60.583C162.801,-55.833 129.518,-52.5402 102,-62 88.8189,-66.5312 76.3211,-75.3466 66.2499,-84.0583"/>
+<polygon fill="black" stroke="black" points="63.7438,-81.6072 58.7266,-90.9388 68.468,-86.7727 63.7438,-81.6072"/>
+<text text-anchor="middle" x="133" y="-65.8" font-family="Times,serif" font-size="14.00">on_done</text>
+</g>
+<!-- inspect failed -->
+<g id="node12" class="node"><title>inspect failed</title>
+<ellipse fill="none" stroke="black" cx="401" cy="-18" rx="46.1069" ry="18"/>
+<text text-anchor="middle" x="401" y="-15.2" font-family="Times,serif" font-size="11.00" fill="red">inspect failed</text>
+</g>
+<!-- inspecting&#45;&gt;inspect failed -->
+<g id="edge24" class="edge"><title>inspecting&#45;&gt;inspect failed</title>
+<path fill="none" stroke="black" d="M252.59,-59.9996C280.483,-52.0522 321.529,-40.3576 353.23,-31.3256"/>
+<polygon fill="black" stroke="black" points="354.507,-34.601 363.165,-28.4948 352.589,-27.8689 354.507,-34.601"/>
+<text text-anchor="middle" x="306" y="-56.8" font-family="Times,serif" font-size="14.00" fill="red">on_fail</text>
+</g>
+<!-- available&#45;&gt;manageable -->
+<g id="edge4" class="edge"><title>available&#45;&gt;manageable</title>
+<path fill="none" stroke="black" d="M366.401,-248.9C307.609,-247.146 184.496,-236.298 102,-179 84.8342,-167.077 69.8471,-148.878 59.2734,-133.89"/>
+<polygon fill="black" stroke="black" points="62.0916,-131.81 53.5746,-125.509 56.3029,-135.746 62.0916,-131.81"/>
+<text text-anchor="middle" x="220" y="-240.8" font-family="Times,serif" font-size="14.00">on_manage</text>
+</g>
+<!-- deploying -->
+<g id="node5" class="node"><title>deploying</title>
+<ellipse fill="none" stroke="black" cx="578" cy="-358" rx="35.4579" ry="18"/>
+<text text-anchor="middle" x="578" y="-355.2" font-family="Times,serif" font-size="11.00">deploying</text>
+</g>
+<!-- available&#45;&gt;deploying -->
+<g id="edge3" class="edge"><title>available&#45;&gt;deploying</title>
+<path fill="none" stroke="black" d="M423.81,-262.585C454.594,-281.758 510.941,-316.855 546.046,-338.72"/>
+<polygon fill="black" stroke="black" points="544.577,-341.928 554.915,-344.244 548.277,-335.986 544.577,-341.928"/>
+<text text-anchor="middle" x="495" y="-325.8" font-family="Times,serif" font-size="14.00">on_deploy</text>
+</g>
+<!-- active -->
+<g id="node6" class="node"><title>active</title>
+<ellipse fill="none" stroke="black" cx="760" cy="-439" rx="27" ry="18"/>
+<text text-anchor="middle" x="760" y="-436.2" font-family="Times,serif" font-size="11.00">active</text>
+</g>
+<!-- deploying&#45;&gt;active -->
+<g id="edge11" class="edge"><title>deploying&#45;&gt;active</title>
+<path fill="none" stroke="black" d="M596.052,-373.765C605.942,-382.221 618.984,-392.259 632,-399 657.592,-412.255 666.509,-409.347 694,-418 704.35,-421.258 715.606,-424.869 725.797,-428.166"/>
+<polygon fill="black" stroke="black" points="724.968,-431.577 735.56,-431.333 727.128,-424.918 724.968,-431.577"/>
+<text text-anchor="middle" x="663" y="-421.8" font-family="Times,serif" font-size="14.00">on_done</text>
+</g>
+<!-- deploy failed -->
+<g id="node9" class="node"><title>deploy failed</title>
+<ellipse fill="none" stroke="black" cx="929" cy="-333" rx="44.498" ry="18"/>
+<text text-anchor="middle" x="929" y="-330.2" font-family="Times,serif" font-size="11.00" fill="red">deploy failed</text>
+</g>
+<!-- deploying&#45;&gt;deploy failed -->
+<g id="edge9" class="edge"><title>deploying&#45;&gt;deploy failed</title>
+<path fill="none" stroke="black" d="M610.223,-365.585C617.338,-367.005 624.895,-368.27 632,-369 735.833,-379.662 764.329,-372.622 866,-349 871.015,-347.835 876.244,-346.568 881.447,-345.273"/>
+<polygon fill="black" stroke="black" points="882.516,-348.613 891.354,-342.771 880.801,-341.827 882.516,-348.613"/>
+<text text-anchor="middle" x="760" y="-376.8" font-family="Times,serif" font-size="14.00" fill="red">on_fail</text>
+</g>
+<!-- wait call&#45;back -->
+<g id="node10" class="node"><title>wait call&#45;back</title>
+<ellipse fill="none" stroke="black" cx="760" cy="-334" rx="48.2143" ry="18"/>
+<text text-anchor="middle" x="760" y="-331.2" font-family="Times,serif" font-size="11.00">wait call&#45;back</text>
+</g>
+<!-- deploying&#45;&gt;wait call&#45;back -->
+<g id="edge10" class="edge"><title>deploying&#45;&gt;wait call&#45;back</title>
+<path fill="none" stroke="black" d="M612.435,-353.542C638.285,-350.095 674.605,-345.253 704.622,-341.25"/>
+<polygon fill="black" stroke="black" points="705.086,-344.72 714.535,-339.929 704.161,-337.781 705.086,-344.72"/>
+<text text-anchor="middle" x="663" y="-353.8" font-family="Times,serif" font-size="14.00">on_wait</text>
+</g>
+<!-- active&#45;&gt;deploying -->
+<g id="edge5" class="edge"><title>active&#45;&gt;deploying</title>
+<path fill="none" stroke="black" d="M734.385,-445.008C707.486,-450.183 663.969,-454.374 632,-437 611.704,-425.97 597.765,-403.412 589.295,-385.214"/>
+<polygon fill="black" stroke="black" points="592.45,-383.693 585.253,-375.917 586.031,-386.484 592.45,-383.693"/>
+<text text-anchor="middle" x="663" y="-452.8" font-family="Times,serif" font-size="14.00">on_rebuild</text>
+</g>
+<!-- deleting -->
+<g id="node7" class="node"><title>deleting</title>
+<ellipse fill="none" stroke="black" cx="1096" cy="-388" rx="31.0408" ry="18"/>
+<text text-anchor="middle" x="1096" y="-385.2" font-family="Times,serif" font-size="11.00">deleting</text>
+</g>
+<!-- active&#45;&gt;deleting -->
+<g id="edge6" class="edge"><title>active&#45;&gt;deleting</title>
+<path fill="none" stroke="black" d="M787.151,-436.92C837.597,-432.618 951.695,-421.48 1046,-402 1050.09,-401.154 1054.35,-400.144 1058.56,-399.058"/>
+<polygon fill="black" stroke="black" points="1059.49,-402.432 1068.22,-396.431 1057.65,-395.677 1059.49,-402.432"/>
+<text text-anchor="middle" x="929" y="-429.8" font-family="Times,serif" font-size="14.00">on_delete</text>
+</g>
+<!-- deleting&#45;&gt;cleaning -->
+<g id="edge22" class="edge"><title>deleting&#45;&gt;cleaning</title>
+<path fill="none" stroke="black" d="M1089.93,-370.074C1074.73,-320.637 1024.64,-186 930,-186 400,-186 400,-186 400,-186 352.88,-186 298.822,-183.898 262.552,-182.182"/>
+<polygon fill="black" stroke="black" points="262.512,-178.676 252.354,-181.687 262.173,-185.668 262.512,-178.676"/>
+<text text-anchor="middle" x="663" y="-189.8" font-family="Times,serif" font-size="14.00">on_clean</text>
+</g>
+<!-- error -->
+<g id="node8" class="node"><title>error</title>
+<ellipse fill="none" stroke="black" cx="1245" cy="-426" rx="27" ry="18"/>
+<text text-anchor="middle" x="1245" y="-423.2" font-family="Times,serif" font-size="11.00" fill="red">error</text>
+</g>
+<!-- deleting&#45;&gt;error -->
+<g id="edge21" class="edge"><title>deleting&#45;&gt;error</title>
+<path fill="none" stroke="black" d="M1125.13,-381.361C1146.44,-377.692 1176.03,-375.563 1200,-385 1209.42,-388.708 1218.01,-395.486 1225.06,-402.478"/>
+<polygon fill="black" stroke="black" points="1222.69,-405.07 1232.06,-410.014 1227.82,-400.306 1222.69,-405.07"/>
+<text text-anchor="middle" x="1173" y="-388.8" font-family="Times,serif" font-size="14.00" fill="red">on_error</text>
+</g>
+<!-- error&#45;&gt;deploying -->
+<g id="edge7" class="edge"><title>error&#45;&gt;deploying</title>
+<path fill="none" stroke="black" d="M1226.51,-439.261C1200,-458.007 1147.38,-490 1097,-490 759,-490 759,-490 759,-490 701.715,-490 677.719,-502.516 632,-468 605.532,-448.018 591.621,-411.378 584.803,-385.902"/>
+<polygon fill="black" stroke="black" points="588.173,-384.948 582.375,-376.081 581.378,-386.628 588.173,-384.948"/>
+<text text-anchor="middle" x="929" y="-493.8" font-family="Times,serif" font-size="14.00">on_rebuild</text>
+</g>
+<!-- error&#45;&gt;deleting -->
+<g id="edge8" class="edge"><title>error&#45;&gt;deleting</title>
+<path fill="none" stroke="black" d="M1218.86,-421.042C1198.97,-416.954 1170.55,-410.747 1146,-404 1141.83,-402.853 1137.48,-401.568 1133.17,-400.238"/>
+<polygon fill="black" stroke="black" points="1133.9,-396.795 1123.31,-397.098 1131.78,-403.466 1133.9,-396.795"/>
+<text text-anchor="middle" x="1173" y="-419.8" font-family="Times,serif" font-size="14.00">on_delete</text>
+</g>
+<!-- deploy failed&#45;&gt;deploying -->
+<g id="edge15" class="edge"><title>deploy failed&#45;&gt;deploying</title>
+<path fill="none" stroke="black" d="M898.136,-319.713C874.28,-309.862 839.709,-297.267 808,-292 765.91,-285.008 754.283,-286.292 712,-292 675.456,-296.933 664.698,-296.951 632,-314 621.446,-319.503 611.087,-327.378 602.367,-334.949"/>
+<polygon fill="black" stroke="black" points="599.928,-332.435 594.86,-341.739 604.624,-337.626 599.928,-332.435"/>
+<text text-anchor="middle" x="760" y="-295.8" font-family="Times,serif" font-size="14.00">on_rebuild</text>
+</g>
+<!-- deploy failed&#45;&gt;deploying -->
+<g id="edge16" class="edge"><title>deploy failed&#45;&gt;deploying</title>
+<path fill="none" stroke="black" d="M907.196,-317.23C895.485,-308.789 880.366,-298.598 866,-291 804.825,-258.647 780.582,-258.742 712,-268 675.456,-272.933 662.671,-269.528 632,-290 616.171,-300.565 602.991,-317.41 593.734,-331.691"/>
+<polygon fill="black" stroke="black" points="590.501,-330.264 588.229,-340.613 596.459,-333.94 590.501,-330.264"/>
+<text text-anchor="middle" x="760" y="-271.8" font-family="Times,serif" font-size="14.00">on_deploy</text>
+</g>
+<!-- deploy failed&#45;&gt;deleting -->
+<g id="edge17" class="edge"><title>deploy failed&#45;&gt;deleting</title>
+<path fill="none" stroke="black" d="M971.199,-338.988C993.799,-343.07 1022.02,-349.492 1046,-359 1052.95,-361.755 1060.07,-365.413 1066.65,-369.2"/>
+<polygon fill="black" stroke="black" points="1064.86,-372.206 1075.23,-374.372 1068.47,-366.211 1064.86,-372.206"/>
+<text text-anchor="middle" x="1019" y="-362.8" font-family="Times,serif" font-size="14.00">on_delete</text>
+</g>
+<!-- wait call&#45;back&#45;&gt;deploying -->
+<g id="edge12" class="edge"><title>wait call&#45;back&#45;&gt;deploying</title>
+<path fill="none" stroke="black" d="M720.19,-323.835C694.653,-318.864 660.758,-315.569 632,-324 622.755,-326.71 613.595,-331.584 605.556,-336.81"/>
+<polygon fill="black" stroke="black" points="603.536,-333.951 597.323,-342.533 607.531,-339.699 603.536,-333.951"/>
+<text text-anchor="middle" x="663" y="-327.8" font-family="Times,serif" font-size="14.00">on_resume</text>
+</g>
+<!-- wait call&#45;back&#45;&gt;deleting -->
+<g id="edge14" class="edge"><title>wait call&#45;back&#45;&gt;deleting</title>
+<path fill="none" stroke="black" d="M797.916,-345.139C807.038,-347.638 816.826,-350.106 826,-352 906.464,-368.614 1002.12,-379.297 1054.94,-384.421"/>
+<polygon fill="black" stroke="black" points="1054.63,-387.907 1064.91,-385.372 1055.29,-380.939 1054.63,-387.907"/>
+<text text-anchor="middle" x="929" y="-378.8" font-family="Times,serif" font-size="14.00">on_delete</text>
+</g>
+<!-- wait call&#45;back&#45;&gt;deploy failed -->
+<g id="edge13" class="edge"><title>wait call&#45;back&#45;&gt;deploy failed</title>
+<path fill="none" stroke="black" d="M808.409,-333.716C828.961,-333.593 853.124,-333.448 874.332,-333.321"/>
+<polygon fill="black" stroke="black" points="874.498,-336.821 884.477,-333.261 874.456,-329.821 874.498,-336.821"/>
+<text text-anchor="middle" x="846" y="-336.8" font-family="Times,serif" font-size="14.00" fill="red">on_fail</text>
+</g>
+<!-- clean failed&#45;&gt;manageable -->
+<g id="edge20" class="edge"><title>clean failed&#45;&gt;manageable</title>
+<path fill="none" stroke="black" d="M359.798,-128.41C294.559,-124.207 165.733,-115.907 94.093,-111.292"/>
+<polygon fill="black" stroke="black" points="94.1568,-107.789 83.9524,-110.638 93.7067,-114.774 94.1568,-107.789"/>
+<text text-anchor="middle" x="220" y="-125.8" font-family="Times,serif" font-size="14.00">on_manage</text>
+</g>
+<!-- inspect failed&#45;&gt;manageable -->
+<g id="edge25" class="edge"><title>inspect failed&#45;&gt;manageable</title>
+<path fill="none" stroke="black" d="M356.638,-12.518C295.406,-6.96648 182.144,-4.92338 102,-52 87.8899,-60.2882 74.4653,-72.5466 63.9967,-83.483"/>
+<polygon fill="black" stroke="black" points="61.1415,-81.4158 56.9287,-91.1371 66.2843,-86.1648 61.1415,-81.4158"/>
+<text text-anchor="middle" x="220" y="-24.8" font-family="Times,serif" font-size="14.00">on_manage</text>
+</g>
+<!-- inspect failed&#45;&gt;inspecting -->
+<g id="edge26" class="edge"><title>inspect failed&#45;&gt;inspecting</title>
+<path fill="none" stroke="black" d="M358.499,-10.6583C333.629,-8.09624 301.913,-8.14407 276,-19 265.565,-23.3717 266.284,-29.2945 258,-37 254.621,-40.1434 251.009,-43.3942 247.415,-46.5652"/>
+<polygon fill="black" stroke="black" points="244.917,-44.0995 239.675,-53.3069 249.515,-49.3779 244.917,-44.0995"/>
+<text text-anchor="middle" x="306" y="-22.8" font-family="Times,serif" font-size="14.00">on_inspect</text>
+</g>
+</g>
+</svg>
diff --git a/tox.ini b/tox.ini
index 30fe7b9883..0b69c5c4db 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ downloadcache = ~/cache/pip
 [testenv:genstates]
 deps = {[testenv]deps}
     pydot2
-commands = {toxinidir}/tools/states_to_dot.py -f {toxinidir}/doc/source/images/states.png
+commands = {toxinidir}/tools/states_to_dot.py -f {toxinidir}/doc/source/images/states.svg --format svg
 
 [testenv:py34]
 # NOTE(viktors): we must change default connection string for MySQL because