diff --git a/icons/3x3.png b/icons/3x3.png
new file mode 100644
index 000000000..81018bb3d
Binary files /dev/null and b/icons/3x3.png differ
diff --git a/icons/clock.png b/icons/clock.png
new file mode 100644
index 000000000..66a00040e
Binary files /dev/null and b/icons/clock.png differ
diff --git a/icons/ead.png b/icons/ead.png
new file mode 100644
index 000000000..20234ce9e
Binary files /dev/null and b/icons/ead.png differ
diff --git a/icons/gas.png b/icons/gas.png
new file mode 100644
index 000000000..d70902e7b
Binary files /dev/null and b/icons/gas.png differ
diff --git a/icons/he.png b/icons/he.png
new file mode 100644
index 000000000..6a0f5e312
Binary files /dev/null and b/icons/he.png differ
diff --git a/icons/icon-NDLTTS.png b/icons/icon-NDLTTS.png
deleted file mode 100644
index 1df3e63b1..000000000
Binary files a/icons/icon-NDLTTS.png and /dev/null differ
diff --git a/icons/icon-ceiling-3m.png b/icons/icon-ceiling-3m.png
deleted file mode 100644
index 6570526fc..000000000
Binary files a/icons/icon-ceiling-3m.png and /dev/null differ
diff --git a/icons/icon-ceiling-calculated.png b/icons/icon-ceiling-calculated.png
deleted file mode 100644
index 0d2edd234..000000000
Binary files a/icons/icon-ceiling-calculated.png and /dev/null differ
diff --git a/icons/icon-ceiling-dc.png b/icons/icon-ceiling-dc.png
deleted file mode 100644
index 04fa57f16..000000000
Binary files a/icons/icon-ceiling-dc.png and /dev/null differ
diff --git a/icons/icon-ead.png b/icons/icon-ead.png
deleted file mode 100644
index 6b054d691..000000000
Binary files a/icons/icon-ead.png and /dev/null differ
diff --git a/icons/icon-lung.png b/icons/icon-lung.png
deleted file mode 100644
index 3d3326d4f..000000000
Binary files a/icons/icon-lung.png and /dev/null differ
diff --git a/icons/icon-mod.png b/icons/icon-mod.png
deleted file mode 100644
index 0e9af1383..000000000
Binary files a/icons/icon-mod.png and /dev/null differ
diff --git a/icons/icon-phegraph.png b/icons/icon-phegraph.png
deleted file mode 100644
index 1c80dc872..000000000
Binary files a/icons/icon-phegraph.png and /dev/null differ
diff --git a/icons/icon-pn2graph.png b/icons/icon-pn2graph.png
deleted file mode 100644
index 71b3c8002..000000000
Binary files a/icons/icon-pn2graph.png and /dev/null differ
diff --git a/icons/icon-po2graph.png b/icons/icon-po2graph.png
deleted file mode 100644
index eb496c8b7..000000000
Binary files a/icons/icon-po2graph.png and /dev/null differ
diff --git a/icons/limit.png b/icons/limit.png
new file mode 100644
index 000000000..f26fa019c
Binary files /dev/null and b/icons/limit.png differ
diff --git a/icons/mod.png b/icons/mod.png
new file mode 100644
index 000000000..42d4d2ae4
Binary files /dev/null and b/icons/mod.png differ
diff --git a/icons/moreinfo.png b/icons/moreinfo.png
new file mode 100644
index 000000000..a26703565
Binary files /dev/null and b/icons/moreinfo.png differ
diff --git a/icons/n2.png b/icons/n2.png
new file mode 100644
index 000000000..de168f338
Binary files /dev/null and b/icons/n2.png differ
diff --git a/icons/o2.png b/icons/o2.png
new file mode 100644
index 000000000..c200de54a
Binary files /dev/null and b/icons/o2.png differ
diff --git a/icons/pc.png b/icons/pc.png
new file mode 100644
index 000000000..5030b6609
Binary files /dev/null and b/icons/pc.png differ
diff --git a/icons/ss.png b/icons/ss.png
new file mode 100644
index 000000000..604aa526f
Binary files /dev/null and b/icons/ss.png differ
diff --git a/subsurface.qrc b/subsurface.qrc
index a1211a66b..ec3398a8b 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -40,16 +40,16 @@
xslt/sensuscsv.xslt
xslt/manualcsv2xml.xslt
xslt/shearwater.xslt
- icons/icon-lung.png
- icons/icon-mod.png
- icons/icon-phegraph.png
- icons/icon-pn2graph.png
- icons/icon-po2graph.png
- icons/icon-ceiling-calculated.png
+ icons/gas.png
+ icons/mod.png
+ icons/he.png
+ icons/n2.png
+ icons/o2.png
+ icons/ss.png
icons/icon-ceiling-alltissues.png
- icons/icon-NDLTTS.png
- icons/icon-ceiling-3m.png
- icons/icon-ceiling-dc.png
- icons/icon-ead.png
+ icons/limit.png
+ icons/3x3.png
+ icons/pc.png
+ icons/ead.png