diff --git a/Software/PC_Application/Calibration/calibrationtracedialog.ui b/Software/PC_Application/Calibration/calibrationtracedialog.ui
index b2d9f97..32597b8 100644
--- a/Software/PC_Application/Calibration/calibrationtracedialog.ui
+++ b/Software/PC_Application/Calibration/calibrationtracedialog.ui
@@ -49,8 +49,8 @@
           <string>Measure</string>
          </property>
          <property name="icon">
-          <iconset theme="media-playback-start">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="media-playback-start" resource="../icons.qrc">
+           <normaloff>:/icons/play.png</normaloff>:/icons/play.png</iconset>
          </property>
         </widget>
        </item>
@@ -60,8 +60,8 @@
           <string>Delete</string>
          </property>
          <property name="icon">
-          <iconset theme="edit-delete">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="edit-delete" resource="../icons.qrc">
+           <normaloff>:/icons/trash.png</normaloff>:/icons/trash.png</iconset>
          </property>
         </widget>
        </item>
@@ -71,7 +71,8 @@
           <string>Open</string>
          </property>
          <property name="icon">
-          <iconset theme="document-open"/>
+          <iconset theme="document-open" resource="../icons.qrc">
+           <normaloff>:/icons/open.png</normaloff>:/icons/open.png</iconset>
          </property>
         </widget>
        </item>
@@ -81,7 +82,8 @@
           <string>Save</string>
          </property>
          <property name="icon">
-          <iconset theme="document-save"/>
+          <iconset theme="document-save" resource="../icons.qrc">
+           <normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
          </property>
         </widget>
        </item>
@@ -103,6 +105,10 @@
          <property name="text">
           <string>Apply Calibration</string>
          </property>
+         <property name="icon">
+          <iconset resource="../icons.qrc">
+           <normaloff>:/icons/ok.png</normaloff>:/icons/ok.png</iconset>
+         </property>
         </widget>
        </item>
       </layout>
@@ -111,6 +117,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/Software/PC_Application/Device/devicelog.ui b/Software/PC_Application/Device/devicelog.ui
index 9c89375..7737120 100644
--- a/Software/PC_Application/Device/devicelog.ui
+++ b/Software/PC_Application/Device/devicelog.ui
@@ -29,8 +29,8 @@
         <string>To File</string>
        </property>
        <property name="icon">
-        <iconset theme="document-save">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="document-save" resource="../icons.qrc">
+         <normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
        </property>
       </widget>
      </item>
@@ -40,8 +40,8 @@
         <string>Clear</string>
        </property>
        <property name="icon">
-        <iconset theme="edit-clear">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="edit-clear" resource="../icons.qrc">
+         <normaloff>:/icons/clear.png</normaloff>:/icons/clear.png</iconset>
        </property>
       </widget>
      </item>
@@ -72,6 +72,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/Software/PC_Application/Device/firmwareupdatedialog.ui b/Software/PC_Application/Device/firmwareupdatedialog.ui
index 1ae910d..5ebccf0 100644
--- a/Software/PC_Application/Device/firmwareupdatedialog.ui
+++ b/Software/PC_Application/Device/firmwareupdatedialog.ui
@@ -94,12 +94,18 @@
        <property name="text">
         <string>Start</string>
        </property>
+       <property name="icon">
+        <iconset resource="../icons.qrc">
+         <normaloff>:/icons/play.png</normaloff>:/icons/play.png</iconset>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
index 8af330c..8f04118 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
@@ -98,17 +98,17 @@ SpectrumAnalyzer::SpectrumAnalyzer(AppWindow *window)
     tb_sweep->addWidget(new QLabel("Span:"));
     tb_sweep->addWidget(eSpan);
 
-    auto bFull = new QPushButton(QIcon::fromTheme("zoom-fit-best"), "");
+    auto bFull = new QPushButton(QIcon::fromTheme("zoom-fit-best", QIcon(":/icons/zoom-fit.png")), "");
     bFull->setToolTip("Full span");
     connect(bFull, &QPushButton::clicked, this, &SpectrumAnalyzer::SetFullSpan);
     tb_sweep->addWidget(bFull);
 
-    auto bZoomIn = new QPushButton(QIcon::fromTheme("zoom-in"), "");
+    auto bZoomIn = new QPushButton(QIcon::fromTheme("zoom-in", QIcon(":/icons/zoom-in.png")), "");
     bZoomIn->setToolTip("Zoom in");
     connect(bZoomIn, &QPushButton::clicked, this, &SpectrumAnalyzer::SpanZoomIn);
     tb_sweep->addWidget(bZoomIn);
 
-    auto bZoomOut = new QPushButton(QIcon::fromTheme("zoom-out"), "");
+    auto bZoomOut = new QPushButton(QIcon::fromTheme("zoom-out", QIcon(":/icons/zoom-out.png")), "");
     bZoomOut->setToolTip("Zoom out");
     connect(bZoomOut, &QPushButton::clicked, this, &SpectrumAnalyzer::SpanZoomOut);
     tb_sweep->addWidget(bZoomOut);
diff --git a/Software/PC_Application/Traces/markerwidget.ui b/Software/PC_Application/Traces/markerwidget.ui
index 8199b80..fdedbd2 100644
--- a/Software/PC_Application/Traces/markerwidget.ui
+++ b/Software/PC_Application/Traces/markerwidget.ui
@@ -44,7 +44,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset theme="list-add"/>
+        <iconset theme="list-add" resource="../icons.qrc">
+         <normaloff>:/icons/add.png</normaloff>:/icons/add.png</iconset>
        </property>
       </widget>
      </item>
@@ -63,7 +64,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset theme="list-remove"/>
+        <iconset theme="list-remove" resource="../icons.qrc">
+         <normaloff>:/icons/remove.png</normaloff>:/icons/remove.png</iconset>
        </property>
       </widget>
      </item>
@@ -84,6 +86,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/Software/PC_Application/Traces/tracewidget.ui b/Software/PC_Application/Traces/tracewidget.ui
index 24a1ea8..2232bd9 100644
--- a/Software/PC_Application/Traces/tracewidget.ui
+++ b/Software/PC_Application/Traces/tracewidget.ui
@@ -92,14 +92,23 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset theme="list-add">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="list-add" resource="../icons.qrc">
+         <normaloff>:/icons/add.png</normaloff>:/icons/add.png</iconset>
        </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="autoRepeat">
+        <bool>false</bool>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -118,8 +127,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset theme="list-remove">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="list-remove" resource="../icons.qrc">
+         <normaloff>:/icons/remove.png</normaloff>:/icons/remove.png</iconset>
        </property>
       </widget>
      </item>
@@ -139,7 +148,7 @@
        </property>
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/import.svg</normaloff>:/icons/import.svg</iconset>
+         <normaloff>:/icons/import.png</normaloff>:/icons/import.png</iconset>
        </property>
       </widget>
      </item>
@@ -159,7 +168,7 @@
        </property>
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/export.svg</normaloff>:/icons/export.svg</iconset>
+         <normaloff>:/icons/export.png</normaloff>:/icons/export.png</iconset>
        </property>
       </widget>
      </item>
@@ -178,8 +187,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset theme="accessories-text-editor">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="accessories-text-editor" resource="../icons.qrc">
+         <normaloff>:/icons/edit.png</normaloff>:/icons/edit.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 897f24a..97c4919 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -183,17 +183,17 @@ VNA::VNA(AppWindow *window)
     tb_sweep->addWidget(new QLabel("Span:"));
     tb_sweep->addWidget(eSpan);
 
-    auto bFull = new QPushButton(QIcon::fromTheme("zoom-fit-best"), "");
+    auto bFull = new QPushButton(QIcon::fromTheme("zoom-fit-best", QIcon(":/icons/zoom-fit.png")), "");
     bFull->setToolTip("Full span");
     connect(bFull, &QPushButton::clicked, this, &VNA::SetFullSpan);
     tb_sweep->addWidget(bFull);
 
-    auto bZoomIn = new QPushButton(QIcon::fromTheme("zoom-in"), "");
+    auto bZoomIn = new QPushButton(QIcon::fromTheme("zoom-in", QIcon(":/icons/zoom-in.png")), "");
     bZoomIn->setToolTip("Zoom in");
     connect(bZoomIn, &QPushButton::clicked, this, &VNA::SpanZoomIn);
     tb_sweep->addWidget(bZoomIn);
 
-    auto bZoomOut = new QPushButton(QIcon::fromTheme("zoom-out"), "");
+    auto bZoomOut = new QPushButton(QIcon::fromTheme("zoom-out", QIcon(":/icons/zoom-out.png")), "");
     bZoomOut->setToolTip("Zoom out");
     connect(bZoomOut, &QPushButton::clicked, this, &VNA::SpanZoomOut);
     tb_sweep->addWidget(bZoomOut);
diff --git a/Software/PC_Application/icons.qrc b/Software/PC_Application/icons.qrc
index 709426a..de0911a 100644
--- a/Software/PC_Application/icons.qrc
+++ b/Software/PC_Application/icons.qrc
@@ -2,15 +2,12 @@
     <qresource prefix="/icons"/>
     <qresource prefix="/">
         <file>icons/add.png</file>
-        <file>icons/delete.png</file>
         <file>icons/edit.png</file>
         <file>icons/invisible.svg</file>
         <file>icons/visible.svg</file>
         <file>icons/pause.svg</file>
         <file>icons/play.svg</file>
         <file>icons/plus.svg</file>
-        <file>icons/export.svg</file>
-        <file>icons/import.svg</file>
         <file>icons/close.svg</file>
         <file>icons/horizontal.svg</file>
         <file>icons/vertical.svg</file>
@@ -22,5 +19,19 @@
         <file>icons/sCpL_small.png</file>
         <file>icons/sLpC_small.png</file>
         <file>icons/sLpL_small.png</file>
+        <file>icons/remove.png</file>
+        <file>icons/cancel.png</file>
+        <file>icons/clear.png</file>
+        <file>icons/export.png</file>
+        <file>icons/import.png</file>
+        <file>icons/ok.png</file>
+        <file>icons/open.png</file>
+        <file>icons/play.png</file>
+        <file>icons/refresh.png</file>
+        <file>icons/save.png</file>
+        <file>icons/trash.png</file>
+        <file>icons/zoom-fit.png</file>
+        <file>icons/zoom-in.png</file>
+        <file>icons/zoom-out.png</file>
     </qresource>
 </RCC>
diff --git a/Software/PC_Application/icons/add.png b/Software/PC_Application/icons/add.png
index 6d4267b..25bce75 100644
Binary files a/Software/PC_Application/icons/add.png and b/Software/PC_Application/icons/add.png differ
diff --git a/Software/PC_Application/icons/cancel.png b/Software/PC_Application/icons/cancel.png
new file mode 100644
index 0000000..6210b3a
Binary files /dev/null and b/Software/PC_Application/icons/cancel.png differ
diff --git a/Software/PC_Application/icons/clear.png b/Software/PC_Application/icons/clear.png
new file mode 100644
index 0000000..58b8878
Binary files /dev/null and b/Software/PC_Application/icons/clear.png differ
diff --git a/Software/PC_Application/icons/delete.png b/Software/PC_Application/icons/delete.png
deleted file mode 100644
index 417656f..0000000
Binary files a/Software/PC_Application/icons/delete.png and /dev/null differ
diff --git a/Software/PC_Application/icons/edit.png b/Software/PC_Application/icons/edit.png
index fd5cdb6..f4bd569 100644
Binary files a/Software/PC_Application/icons/edit.png and b/Software/PC_Application/icons/edit.png differ
diff --git a/Software/PC_Application/icons/export.png b/Software/PC_Application/icons/export.png
new file mode 100644
index 0000000..5493c45
Binary files /dev/null and b/Software/PC_Application/icons/export.png differ
diff --git a/Software/PC_Application/icons/export.svg b/Software/PC_Application/icons/export.svg
deleted file mode 100644
index 63d1e45..0000000
--- a/Software/PC_Application/icons/export.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M352,288.994v127.008H64v-288h96v-64H32c-17.664,0-32,14.336-32,32v352c0,17.696,14.336,32,32,32h352
-			c17.696,0,32-14.304,32-32V288.994H352z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M505.6,131.202l-128-96c-4.8-3.648-11.328-4.224-16.736-1.504c-5.44,2.72-8.864,8.256-8.864,14.304v48h-48
-			c-97.056,0-176,78.944-176,176c0,7.424,5.12,13.888,12.32,15.584c1.216,0.288,2.464,0.416,3.68,0.416
-			c5.952,0,11.552-3.328,14.304-8.832l3.776-7.52c24.544-49.12,73.888-79.648,128.8-79.648H352v48
-			c0,6.048,3.424,11.584,8.832,14.304c5.408,2.72,11.936,2.144,16.768-1.504l128-96c4.032-3.008,6.4-7.776,6.4-12.8
-			S509.632,134.21,505.6,131.202z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/Software/PC_Application/icons/import.png b/Software/PC_Application/icons/import.png
new file mode 100644
index 0000000..2c2c6d1
Binary files /dev/null and b/Software/PC_Application/icons/import.png differ
diff --git a/Software/PC_Application/icons/import.svg b/Software/PC_Application/icons/import.svg
deleted file mode 100644
index ce928c3..0000000
--- a/Software/PC_Application/icons/import.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M287.52,224.48c-3.36-3.36-8-5.088-12.736-4.64l-124.448,11.296c-6.176,0.576-11.52,4.672-13.6,10.496
-			c-2.112,5.856-0.672,12.384,3.712,16.768l33.952,33.952L4.704,462.048c-6.24,6.24-6.24,16.384,0,22.624l22.624,22.624
-			c6.24,6.272,16.352,6.272,22.624,0L219.648,337.6l33.952,33.952c4.384,4.384,10.912,5.824,16.768,3.744
-			c2.24-0.832,4.224-2.112,5.856-3.744c2.592-2.592,4.288-6.048,4.608-9.888l11.328-124.448
-			C292.608,232.48,290.88,227.84,287.52,224.48z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M480,0H32C14.336,0,0,14.336,0,32v320h64V64h384v384H160v64h320c17.696,0,32-14.304,32-32V32C512,14.336,497.696,0,480,0z
-			"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/Software/PC_Application/icons/ok.png b/Software/PC_Application/icons/ok.png
new file mode 100644
index 0000000..ccdcc21
Binary files /dev/null and b/Software/PC_Application/icons/ok.png differ
diff --git a/Software/PC_Application/icons/open.png b/Software/PC_Application/icons/open.png
new file mode 100644
index 0000000..d54333d
Binary files /dev/null and b/Software/PC_Application/icons/open.png differ
diff --git a/Software/PC_Application/icons/play.png b/Software/PC_Application/icons/play.png
new file mode 100644
index 0000000..b75d0c2
Binary files /dev/null and b/Software/PC_Application/icons/play.png differ
diff --git a/Software/PC_Application/icons/refresh.png b/Software/PC_Application/icons/refresh.png
new file mode 100644
index 0000000..24a8749
Binary files /dev/null and b/Software/PC_Application/icons/refresh.png differ
diff --git a/Software/PC_Application/icons/remove.png b/Software/PC_Application/icons/remove.png
new file mode 100644
index 0000000..87ed6ea
Binary files /dev/null and b/Software/PC_Application/icons/remove.png differ
diff --git a/Software/PC_Application/icons/save.png b/Software/PC_Application/icons/save.png
new file mode 100644
index 0000000..7e3a493
Binary files /dev/null and b/Software/PC_Application/icons/save.png differ
diff --git a/Software/PC_Application/icons/trash.png b/Software/PC_Application/icons/trash.png
new file mode 100644
index 0000000..a3d6291
Binary files /dev/null and b/Software/PC_Application/icons/trash.png differ
diff --git a/Software/PC_Application/icons/zoom-fit.png b/Software/PC_Application/icons/zoom-fit.png
new file mode 100644
index 0000000..8606e06
Binary files /dev/null and b/Software/PC_Application/icons/zoom-fit.png differ
diff --git a/Software/PC_Application/icons/zoom-in.png b/Software/PC_Application/icons/zoom-in.png
new file mode 100644
index 0000000..af96a67
Binary files /dev/null and b/Software/PC_Application/icons/zoom-in.png differ
diff --git a/Software/PC_Application/icons/zoom-out.png b/Software/PC_Application/icons/zoom-out.png
new file mode 100644
index 0000000..8c0ce4c
Binary files /dev/null and b/Software/PC_Application/icons/zoom-out.png differ
diff --git a/Software/PC_Application/main.ui b/Software/PC_Application/main.ui
index e00228d..c274ce9 100644
--- a/Software/PC_Application/main.ui
+++ b/Software/PC_Application/main.ui
@@ -20,7 +20,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -88,8 +88,8 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset theme="view-refresh">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="view-refresh" resource="icons.qrc">
+     <normaloff>:/icons/refresh.png</normaloff>:/icons/refresh.png</iconset>
    </property>
    <property name="text">
     <string>Update Device List</string>
@@ -140,6 +140,8 @@
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="icons.qrc"/>
+ </resources>
  <connections/>
 </ui>