diff --git a/icons/icon-ceiling-3m.png b/icons/icon-ceiling-3m.png
new file mode 100644
index 000000000..d5d5149bb
Binary files /dev/null and b/icons/icon-ceiling-3m.png differ
diff --git a/icons/icon-ceiling-calculated.png b/icons/icon-ceiling-calculated.png
new file mode 100644
index 000000000..dc67ad5df
Binary files /dev/null and b/icons/icon-ceiling-calculated.png differ
diff --git a/icons/icon-ceiling-dc.png b/icons/icon-ceiling-dc.png
new file mode 100644
index 000000000..b0dc65046
Binary files /dev/null and b/icons/icon-ceiling-dc.png differ
diff --git a/icons/icon-ead.png b/icons/icon-ead.png
new file mode 100644
index 000000000..2ef109c25
Binary files /dev/null and b/icons/icon-ead.png differ
diff --git a/icons/icon-lung.png b/icons/icon-lung.png
new file mode 100644
index 000000000..1edee199f
Binary files /dev/null and b/icons/icon-lung.png differ
diff --git a/icons/icon-mod.png b/icons/icon-mod.png
new file mode 100644
index 000000000..085c0e3fd
Binary files /dev/null and b/icons/icon-mod.png differ
diff --git a/icons/icon-phegraph.png b/icons/icon-phegraph.png
new file mode 100644
index 000000000..5e3f586b0
Binary files /dev/null and b/icons/icon-phegraph.png differ
diff --git a/icons/icon-pn2graph.png b/icons/icon-pn2graph.png
new file mode 100644
index 000000000..8c1444db1
Binary files /dev/null and b/icons/icon-pn2graph.png differ
diff --git a/icons/icon-po2graph.png b/icons/icon-po2graph.png
new file mode 100644
index 000000000..51c133de4
Binary files /dev/null and b/icons/icon-po2graph.png differ
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index accfe4758..8809a7278 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -169,7 +169,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_depth</normaloff>:/icon_depth</iconset>
+                     <normaloff>:/icon_o2</normaloff>:/icon_o2</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -195,7 +195,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/average</normaloff>:/average</iconset>
+                     <normaloff>:/icon_n2</normaloff>:/icon_n2</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -221,7 +221,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/plus</normaloff>:/plus</iconset>
+                     <normaloff>:/icon_he</normaloff>:/icon_he</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -247,7 +247,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/maximum</normaloff>:/maximum</iconset>
+                     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -273,7 +273,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/minimum</normaloff>:/minimum</iconset>
+                     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -291,6 +291,9 @@
                  </item>
                  <item>
                   <widget class="QToolButton" name="profDcCeiling">
+                   <property name="enabled">
+                    <bool>true</bool>
+                   </property>
                    <property name="toolTip">
                     <string>Show the DC Reported Ceiling</string>
                    </property>
@@ -299,7 +302,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/ruler</normaloff>:/ruler</iconset>
+                     <normaloff>:/icon_ceiling_dc</normaloff>:/icon_ceiling_dc</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -317,6 +320,9 @@
                  </item>
                  <item>
                   <widget class="QToolButton" name="profCalcCeiling">
+                   <property name="enabled">
+                    <bool>true</bool>
+                   </property>
                    <property name="toolTip">
                     <string>Show the Calculated Ceiling</string>
                    </property>
@@ -325,7 +331,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/subsurface-icon</normaloff>:/subsurface-icon</iconset>
+                     <normaloff>:/icon_ceiling_calculated</normaloff>:/icon_ceiling_calculated</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -351,7 +357,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/star</normaloff>:/star</iconset>
+                     <normaloff>:/icon_ceiling_3m</normaloff>:/icon_ceiling_3m</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -429,7 +435,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/warning</normaloff>:/warning</iconset>
+                     <normaloff>:/icon_lung</normaloff>:/icon_lung</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -455,7 +461,7 @@
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/flag</normaloff>:/flag</iconset>
+                     <normaloff>:/units</normaloff>:/units</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -588,7 +594,7 @@
      <x>0</x>
      <y>0</y>
      <width>1418</width>
-     <height>25</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/subsurface.qrc b/subsurface.qrc
index a4fb851ef..7032109bf 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -1,37 +1,32 @@
- <!DOCTYPE RCC><RCC version="1.0">
- <qresource>
-	<file alias="star">icons/star.svg</file>
-	<file alias="subsurface-icon">icons/subsurface-icon.png</file>
-	<file alias="plus">icons/plus.png</file>
-	<file alias="trash">icons/trash.png</file>
-	<file alias="units">icons/units.png</file>
-	<file alias="advanced">icons/advanced.png</file>
-	<file alias="edit">icons/advanced.png</file>
-	<file alias="graph">icons/graph.png</file>
-<!--	<file alias="minimum">icons/minimum.svg</file> -->
-	<file alias="minimum">icons/minimum.png</file>
-<!--	<file alias="maximum">icons/maximum.svg</file> -->
-	<file alias="maximum">icons/maximum.png</file>
-<!--	<file alias="average">icons/average.svg</file> -->
-	<file alias="average">icons/average.png</file>
-	<file alias="warning">icons/warning.png</file>
-	<file alias="flag">icons/flag.png</file>
-<!--	<file alias="scale">icons/scale.svg</file> -->
-	<file alias="scale">icons/scale.png</file>
-<!--	<file alias="ruler">icons/ruler.svg</file> -->
-	<file alias="ruler">icons/ruler.png</file>
-	<file alias="poster1">icons/poster1.jpg</file>
-	<file alias="poster2">icons/poster2.jpg</file>
-	<file alias="poster3">icons/poster3.jpg</file>
-	<file alias="arrow_up">icons/planner/arrow_up.png</file>
-	<file alias="arrow_down">icons/planner/arrow_down.png</file>
-	<file alias="icon_time">icons/planner/icon_time.png</file>
-	<file alias="icon_depth">icons/planner/icon_depth.png</file>
-	<file alias="round_base">icons/planner/round_base.png</file>
-	<file alias="right_wing">icons/planner/right_wing.png</file>
-	<file alias="left_wing">icons/planner/left_wing.png</file>
-	<file alias="plan_minus">icons/planner/minus.png</file>
-	<file alias="plan_plus">icons/planner/plus.png</file>
+<RCC>
+    <qresource prefix="/">
+        <file alias="star">icons/star.svg</file>
+        <file alias="subsurface-icon">icons/subsurface-icon.png</file>
+        <file alias="plus">icons/plus.png</file>
+        <file alias="trash">icons/trash.png</file>
+        <file alias="units">icons/units.png</file>
+        <file alias="advanced">icons/advanced.png</file>
+        <file alias="edit">icons/advanced.png</file>
+        <file alias="graph">icons/graph.png</file>
+        <file alias="minimum">icons/minimum.png</file>
+        <file alias="maximum">icons/maximum.png</file>
+        <file alias="average">icons/average.png</file>
+        <file alias="warning">icons/warning.png</file>
+        <file alias="flag">icons/flag.png</file>
+        <file alias="scale">icons/scale.png</file>
+        <file alias="ruler">icons/ruler.png</file>
+        <file alias="poster1">icons/poster1.jpg</file>
+        <file alias="poster2">icons/poster2.jpg</file>
+        <file alias="poster3">icons/poster3.jpg</file>
+        <file alias="arrow_up">icons/planner/arrow_up.png</file>
+        <file alias="arrow_down">icons/planner/arrow_down.png</file>
+        <file alias="icon_time">icons/planner/icon_time.png</file>
+        <file alias="icon_depth">icons/planner/icon_depth.png</file>
+        <file alias="round_base">icons/planner/round_base.png</file>
+        <file alias="right_wing">icons/planner/right_wing.png</file>
+        <file alias="left_wing">icons/planner/left_wing.png</file>
+        <file alias="plan_minus">icons/planner/minus.png</file>
+        <file alias="plan_plus">icons/planner/plus.png</file>
         <file>xslt/commonTemplates.xsl</file>
         <file>xslt/csv2xml.xslt</file>
         <file>xslt/divelogs-export.xslt</file>
@@ -47,5 +42,14 @@
         <file>xslt/sensuscsv.xslt</file>
         <file>xslt/manualcsv2xml.xslt</file>
         <file>xslt/shearwater.xslt</file>
- </qresource>
- </RCC>
+        <file alias="icon_lung">icons/icon-lung.png</file>
+        <file alias="icon_mod">icons/icon-mod.png</file>
+        <file alias="icon_he">icons/icon-phegraph.png</file>
+        <file alias="icon_n2">icons/icon-pn2graph.png</file>
+        <file alias="icon_o2">icons/icon-po2graph.png</file>
+        <file alias="icon_ceiling_calculated">icons/icon-ceiling-calculated.png</file>
+        <file alias="icon_ceiling_3m">icons/icon-ceiling-3m.png</file>
+        <file alias="icon_ceiling_dc">icons/icon-ceiling-dc.png</file>
+        <file alias="icon_ead">icons/icon-ead.png</file>
+    </qresource>
+</RCC>