diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro
index d80f365..9a06d93 100644
--- a/Software/PC_Application/Application.pro
+++ b/Software/PC_Application/Application.pro
@@ -256,7 +256,6 @@ FORMS += \
     Traces/tracewidget.ui \
     Traces/xyplotaxisdialog.ui \
     VNA/Deembedding/deembeddingdialog.ui \
-    VNA/Deembedding/form.ui \
     VNA/Deembedding/matchingnetworkdialog.ui \
     VNA/Deembedding/measurementdialog.ui \
     VNA/Deembedding/portextensioneditdialog.ui \
diff --git a/Software/PC_Application/Traces/Math/tracematheditdialog.ui b/Software/PC_Application/Traces/Math/tracematheditdialog.ui
index 44b44d1..4dcff3d 100644
--- a/Software/PC_Application/Traces/Math/tracematheditdialog.ui
+++ b/Software/PC_Application/Traces/Math/tracematheditdialog.ui
@@ -113,8 +113,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-up">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="go-up" resource="../../icons.qrc">
+           <normaloff>:/icons/up.png</normaloff>:/icons/up.png</iconset>
          </property>
         </widget>
        </item>
@@ -130,8 +130,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-down">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="go-down" resource="../../icons.qrc">
+           <normaloff>:/icons/down.png</normaloff>:/icons/down.png</iconset>
          </property>
         </widget>
        </item>
diff --git a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui
index 1cbf9d2..8918e4a 100644
--- a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui
+++ b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui
@@ -79,8 +79,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-up">
-           <normaloff>../../Traces/Math</normaloff>../../Traces/Math</iconset>
+          <iconset theme="go-up" resource="../../icons.qrc">
+           <normaloff>:/icons/up.png</normaloff>:/icons/up.png</iconset>
          </property>
         </widget>
        </item>
@@ -96,8 +96,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-down">
-           <normaloff>../../Traces/Math</normaloff>../../Traces/Math</iconset>
+          <iconset theme="go-down" resource="../../icons.qrc">
+           <normaloff>:/icons/down.png</normaloff>:/icons/down.png</iconset>
          </property>
         </widget>
        </item>
diff --git a/Software/PC_Application/VNA/Deembedding/form.ui b/Software/PC_Application/VNA/Deembedding/form.ui
deleted file mode 100644
index e116c9a..0000000
--- a/Software/PC_Application/VNA/Deembedding/form.ui
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>339</width>
-    <height>238</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">QWidget#Form {image: url(:/icons/parallelC.svg);}
-border: 1px solid red;</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLineEdit" name="lineEdit"/>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>186</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Software/PC_Application/icons.qrc b/Software/PC_Application/icons.qrc
index 2e6e1eb..53c4752 100644
--- a/Software/PC_Application/icons.qrc
+++ b/Software/PC_Application/icons.qrc
@@ -47,5 +47,7 @@
         <file>icons/DUT.svg</file>
         <file>icons/port1.svg</file>
         <file>icons/port2.svg</file>
+        <file>icons/down.png</file>
+        <file>icons/up.png</file>
     </qresource>
 </RCC>
diff --git a/Software/PC_Application/icons/down.png b/Software/PC_Application/icons/down.png
new file mode 100644
index 0000000..3866fd0
Binary files /dev/null and b/Software/PC_Application/icons/down.png differ
diff --git a/Software/PC_Application/icons/up.png b/Software/PC_Application/icons/up.png
new file mode 100644
index 0000000..9426d12
Binary files /dev/null and b/Software/PC_Application/icons/up.png differ
diff --git a/Software/PC_Application/preferencesdialog.ui b/Software/PC_Application/preferencesdialog.ui
index 0ed73e4..ae3c812 100644
--- a/Software/PC_Application/preferencesdialog.ui
+++ b/Software/PC_Application/preferencesdialog.ui
@@ -73,7 +73,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="Startup">
         <layout class="QHBoxLayout" name="horizontalLayout_4">