diff --git a/icons/average.png b/icons/average.png
deleted file mode 100644
index 0cfa30d19..000000000
Binary files a/icons/average.png and /dev/null differ
diff --git a/icons/info-icon.png b/icons/info-icon.png
deleted file mode 100644
index 2c229d41a..000000000
Binary files a/icons/info-icon.png and /dev/null differ
diff --git a/icons/maximum.png b/icons/maximum.png
deleted file mode 100644
index 9ac38e880..000000000
Binary files a/icons/maximum.png and /dev/null differ
diff --git a/icons/minimum.png b/icons/minimum.png
deleted file mode 100644
index a349634fd..000000000
Binary files a/icons/minimum.png and /dev/null differ
diff --git a/icons/violation-icon.png b/icons/violation-icon.png
deleted file mode 100644
index 36cfd004b..000000000
Binary files a/icons/violation-icon.png and /dev/null differ
diff --git a/icons/warning-icon.png b/icons/warning-icon.png
deleted file mode 100644
index 4f24b3093..000000000
Binary files a/icons/warning-icon.png and /dev/null differ
diff --git a/icons/warning.png b/icons/warning.png
deleted file mode 100644
index a94b3be09..000000000
Binary files a/icons/warning.png and /dev/null differ
diff --git a/profile.qrc b/profile.qrc
index 29c7161c8..3e7b6ebf6 100644
--- a/profile.qrc
+++ b/profile.qrc
@@ -1,9 +1,9 @@
 <RCC>
 	<qresource prefix="/">
 		<!-- ************ icons used in the profile ***************** -->
-		<file alias="status-warning-icon">icons/warning-icon.png</file>
-		<file alias="status-violation-icon">icons/violation-icon.png</file>
-		<file alias="status-info-icon">icons/info-icon.png</file>
+		<file alias="status-warning-icon">icons/warning-icon.svg</file>
+		<file alias="status-violation-icon">icons/violation-icon.svg</file>
+		<file alias="status-info-icon">icons/info-icon.svg</file>
 		<file alias="bailout-icon">icons/OC.png</file>
 		<file alias="onCCRLoop-icon">icons/CCR.png</file>
 		<file alias="dive-bookmark-icon">icons/flag.svg</file>
diff --git a/subsurface.qrc b/subsurface.qrc
index 8d0e1dc0c..6304e0d9d 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -3,7 +3,7 @@
         <file alias="satellite-icon">icons/satellite.svg</file>
         <file alias="graph-icon">icons/pref_tech.png</file>
         <file alias="star-icon">icons/star.svg</file>
-        <file alias="subsurface-icon">icons/subsurface-icon.png</file>
+        <file alias="subsurface-icon">icons/subsurface-icon.svg</file>
         <file alias="subsurface-mobile-icon">icons/subsurface-mobile-icon.png</file>
         <file alias="list-add-icon">icons/plus.png</file>
         <file alias="list-remove-icon">icons/trash.png</file>
@@ -17,13 +17,13 @@
         <file alias="preferences-log-icon">icons/pref_log.png</file>
         <file alias="preferences-display-icon">icons/pref_display.png</file>
         <file alias="preferences-reset-icon">icons/pref_reset.png</file>
-        <file alias="preferences-reset-warning-icon">icons/warning.png</file>
+        <file alias="preferences-reset-warning-icon">icons/warning-icon.svg</file>
         <file alias="scale-graph-icon">icons/graph.png</file>
-        <file alias="value-minimum-icon">icons/minimum.png</file>
-        <file alias="value-maximum-icon">icons/maximum.png</file>
-        <file alias="value-average-icon">icons/average.png</file>
+        <file alias="value-minimum-icon">icons/minimum.svg</file>
+        <file alias="value-maximum-icon">icons/maximum.svg</file>
+        <file alias="value-average-icon">icons/average.svg</file>
         <file alias="salinity-warning-icon">icons/bluewarning.png</file>
-        <file alias="ruler-icon">icons/ruler.png</file>
+        <file alias="ruler-icon">icons/ruler.svg</file>
         <file alias="poster-icon">icons/poster.png</file>
         <file>xslt/commonTemplates.xsl</file>
         <file>xslt/csv2xml.xslt</file>