From 8343cc806589f6c66ebf72c1b00365699c76a88d Mon Sep 17 00:00:00 2001
From: Akashdeep Dhar <akashdeep.dhar@gmail.com>
Date: Jan 02 2022 14:14:48 +0000
Subject: Import/use font resources in mainwind and procwind


Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>

---

diff --git a/assets/uifiles/mainwind.ui b/assets/uifiles/mainwind.ui
index 5c156d1..e48912d 100644
--- a/assets/uifiles/mainwind.ui
+++ b/assets/uifiles/mainwind.ui
@@ -2921,7 +2921,7 @@
        </size>
       </property>
       <property name="styleSheet">
-       <string notr="true">QTableWidget::item{font: 10pt &quot;Inter&quot;;} QTableWidget::item:selected{background-color: rgba(0, 128, 128, 1);}</string>
+       <string notr="true">font: 10pt &quot;Inter&quot;;</string>
       </property>
       <property name="verticalScrollBarPolicy">
        <enum>Qt::ScrollBarAlwaysOn</enum>
@@ -7225,7 +7225,7 @@
         </size>
        </property>
        <property name="styleSheet">
-        <string notr="true">QListWidget::item{font: 10pt &quot;Inter&quot;; border-radius: 0px;} QListWidget::item:selected{background-color: rgba(0, 128, 128, 1);}</string>
+        <string notr="true">font: 10pt &quot;Inter&quot;; border-radius: 0px;</string>
        </property>
       </widget>
       <widget class="QLabel" name="fefllb01">
@@ -7369,16 +7369,16 @@
         </size>
        </property>
        <property name="styleSheet">
-        <string notr="true">border: none;</string>
+        <string notr="true">color: #008080; font: 900 35pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
        </property>
        <property name="text">
-        <string/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="mainwind.qrc">:/mainwind/images/icon.png</pixmap>
+        <string>tachometer-alt</string>
        </property>
        <property name="scaledContents">
-        <bool>true</bool>
+        <bool>false</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
        </property>
       </widget>
       <widget class="QLabel" name="cntbhead">
@@ -7599,52 +7599,6 @@
     <property name="frameShadow">
      <enum>QFrame::Raised</enum>
     </property>
-    <widget class="QLabel" name="compicon">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>10</y>
-       <width>20</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="cursor">
-      <cursorShape>ArrowCursor</cursorShape>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">border: none; background-color: rgba(0,0,0,0);</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="mainwind.qrc">:/mainwind/images/comp.png</pixmap>
-     </property>
-     <property name="scaledContents">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
     <widget class="QLabel" name="userhost">
      <property name="geometry">
       <rect>
@@ -7720,10 +7674,10 @@
       <cursorShape>ArrowCursor</cursorShape>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color: #008080; border: none;</string>
+      <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
      </property>
      <property name="text">
-      <string/>
+      <string>laptop</string>
      </property>
      <property name="default">
       <bool>false</bool>
@@ -7843,10 +7797,10 @@
        <cursorShape>ArrowCursor</cursorShape>
       </property>
       <property name="styleSheet">
-       <string notr="true">background-color: #008080;</string>
+       <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
       </property>
       <property name="text">
-       <string/>
+       <string>copy</string>
       </property>
       <property name="default">
        <bool>false</bool>
@@ -7855,52 +7809,6 @@
        <bool>false</bool>
       </property>
      </widget>
-     <widget class="QLabel" name="swapicon">
-      <property name="geometry">
-       <rect>
-        <x>5</x>
-        <y>5</y>
-        <width>20</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="cursor">
-       <cursorShape>ArrowCursor</cursorShape>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">border: none; background-color: rgba(0,0,0,0);</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="pixmap">
-       <pixmap resource="mainwind.qrc">:/mainwind/images/swap.png</pixmap>
-      </property>
-      <property name="scaledContents">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
      <widget class="QLabel" name="swapperc">
       <property name="geometry">
        <rect>
@@ -8022,10 +7930,10 @@
        <cursorShape>ArrowCursor</cursorShape>
       </property>
       <property name="styleSheet">
-       <string notr="true">background-color: #008080;</string>
+       <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
       </property>
       <property name="text">
-       <string/>
+       <string>hdd</string>
       </property>
       <property name="default">
        <bool>false</bool>
@@ -8034,52 +7942,6 @@
        <bool>false</bool>
       </property>
      </widget>
-     <widget class="QLabel" name="diskicon">
-      <property name="geometry">
-       <rect>
-        <x>5</x>
-        <y>5</y>
-        <width>20</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="cursor">
-       <cursorShape>ArrowCursor</cursorShape>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">border: none; background-color: rgba(0,0,0,0);</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="pixmap">
-       <pixmap resource="mainwind.qrc">:/mainwind/images/disk.png</pixmap>
-      </property>
-      <property name="scaledContents">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
      <widget class="QLabel" name="diskperc">
       <property name="geometry">
        <rect>
@@ -8201,10 +8063,10 @@
        <cursorShape>ArrowCursor</cursorShape>
       </property>
       <property name="styleSheet">
-       <string notr="true">background-color: #008080;</string>
+       <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
       </property>
       <property name="text">
-       <string/>
+       <string>memory</string>
       </property>
       <property name="default">
        <bool>false</bool>
@@ -8213,52 +8075,6 @@
        <bool>false</bool>
       </property>
      </widget>
-     <widget class="QLabel" name="memoicon">
-      <property name="geometry">
-       <rect>
-        <x>5</x>
-        <y>5</y>
-        <width>20</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="cursor">
-       <cursorShape>ArrowCursor</cursorShape>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">border: none; background-color: rgba(0,0,0,0);</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="pixmap">
-       <pixmap resource="mainwind.qrc">:/mainwind/images/memo.png</pixmap>
-      </property>
-      <property name="scaledContents">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
      <widget class="QLabel" name="memoperc">
       <property name="geometry">
        <rect>
@@ -8380,10 +8196,10 @@
        <cursorShape>ArrowCursor</cursorShape>
       </property>
       <property name="styleSheet">
-       <string notr="true">background-color: #008080;</string>
+       <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
       </property>
       <property name="text">
-       <string/>
+       <string>microchip</string>
       </property>
       <property name="default">
        <bool>false</bool>
@@ -8392,52 +8208,6 @@
        <bool>false</bool>
       </property>
      </widget>
-     <widget class="QLabel" name="cpudicon">
-      <property name="geometry">
-       <rect>
-        <x>5</x>
-        <y>5</y>
-        <width>20</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="cursor">
-       <cursorShape>ArrowCursor</cursorShape>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">border: none; background-color: rgba(0,0,0,0);</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="pixmap">
-       <pixmap resource="mainwind.qrc">:/mainwind/images/cpud.png</pixmap>
-      </property>
-      <property name="scaledContents">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
      <widget class="QLabel" name="cpudperc">
       <property name="geometry">
        <rect>
@@ -8490,7 +8260,6 @@
      </widget>
     </widget>
     <zorder>compbutn</zorder>
-    <zorder>compicon</zorder>
     <zorder>userhost</zorder>
     <zorder>kernvers</zorder>
     <zorder>swapfrme</zorder>
@@ -8507,8 +8276,6 @@
    <header>PyQt5.QtChart</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="mainwind.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/assets/uifiles/procwind.ui b/assets/uifiles/procwind.ui
index d1d3a78..8601995 100644
--- a/assets/uifiles/procwind.ui
+++ b/assets/uifiles/procwind.ui
@@ -162,53 +162,10 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color: #008080;</string>
+      <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
      </property>
      <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="pcidicon">
-     <property name="geometry">
-      <rect>
-       <x>5</x>
-       <y>5</y>
-       <width>20</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>20</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-color: rgba(0,0,0,0);</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="procwind.qrc">:/procwind/images/tack.png</pixmap>
-     </property>
-     <property name="scaledContents">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <string>thumbtack</string>
      </property>
     </widget>
     <widget class="QLabel" name="pcidtext">
@@ -350,53 +307,10 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color: #008080;</string>
+      <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
      </property>
      <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="cpudicon">
-     <property name="geometry">
-      <rect>
-       <x>5</x>
-       <y>5</y>
-       <width>20</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-color: rgba(0,0,0,0);</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="procwind.qrc">:/procwind/images/cpud.png</pixmap>
-     </property>
-     <property name="scaledContents">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <string>microchip</string>
      </property>
     </widget>
     <widget class="QLabel" name="cpudtext">
@@ -504,53 +418,10 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color: #008080;</string>
+      <string notr="true">background-color: #008080; color: #ffffff; font: 900 15pt &quot;Font Awesome 5 Free&quot;; border: none;</string>
      </property>
      <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="memoicon">
-     <property name="geometry">
-      <rect>
-       <x>5</x>
-       <y>5</y>
-       <width>20</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-color: rgba(0,0,0,0);</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="procwind.qrc">:/procwind/images/memo.png</pixmap>
-     </property>
-     <property name="scaledContents">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <string>memory</string>
      </property>
     </widget>
     <widget class="QLabel" name="memotext">
@@ -2056,8 +1927,6 @@
    </widget>
   </widget>
  </widget>
- <resources>
-  <include location="procwind.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/obserware/sources/screens/mainwind/interface.py b/obserware/sources/screens/mainwind/interface.py
index e42dda0..467cf50 100644
--- a/obserware/sources/screens/mainwind/interface.py
+++ b/obserware/sources/screens/mainwind/interface.py
@@ -1221,9 +1221,7 @@ class Ui_mainwind(object):
         self.proctree.setSizePolicy(sizePolicy)
         self.proctree.setMinimumSize(QtCore.QSize(935, 420))
         self.proctree.setMaximumSize(QtCore.QSize(935, 420))
-        self.proctree.setStyleSheet(
-            'QTableWidget::item{font: 10pt "Inter";} QTableWidget::item:selected{background-color: rgba(0, 128, 128, 1);}'
-        )
+        self.proctree.setStyleSheet('font: 10pt "Inter";')
         self.proctree.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
         self.proctree.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
         self.proctree.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
@@ -2974,9 +2972,7 @@ class Ui_mainwind(object):
         self.fefllist.setSizePolicy(sizePolicy)
         self.fefllist.setMinimumSize(QtCore.QSize(350, 170))
         self.fefllist.setMaximumSize(QtCore.QSize(350, 170))
-        self.fefllist.setStyleSheet(
-            'QListWidget::item{font: 10pt "Inter"; border-radius: 0px;} QListWidget::item:selected{background-color: rgba(0, 128, 128, 1);}'
-        )
+        self.fefllist.setStyleSheet('font: 10pt "Inter"; border-radius: 0px;')
         self.fefllist.setObjectName("fefllist")
         self.fefllb01 = QtWidgets.QLabel(self.feflfrme)
         self.fefllb01.setGeometry(QtCore.QRect(5, 5, 350, 15))
@@ -3043,10 +3039,11 @@ class Ui_mainwind(object):
         self.cntbicon.setSizePolicy(sizePolicy)
         self.cntbicon.setMinimumSize(QtCore.QSize(55, 55))
         self.cntbicon.setMaximumSize(QtCore.QSize(55, 55))
-        self.cntbicon.setStyleSheet("border: none;")
-        self.cntbicon.setText("")
-        self.cntbicon.setPixmap(QtGui.QPixmap(":/mainwind/images/icon.png"))
-        self.cntbicon.setScaledContents(True)
+        self.cntbicon.setStyleSheet(
+            'color: #008080; font: 900 35pt "Font Awesome 5 Free"; border: none;'
+        )
+        self.cntbicon.setScaledContents(False)
+        self.cntbicon.setAlignment(QtCore.Qt.AlignCenter)
         self.cntbicon.setObjectName("cntbicon")
         self.cntbhead = QtWidgets.QLabel(self.cntbfrme)
         self.cntbhead.setGeometry(QtCore.QRect(5, 100, 925, 20))
@@ -3136,24 +3133,6 @@ class Ui_mainwind(object):
         self.bottomfm.setFrameShape(QtWidgets.QFrame.StyledPanel)
         self.bottomfm.setFrameShadow(QtWidgets.QFrame.Raised)
         self.bottomfm.setObjectName("bottomfm")
-        self.compicon = QtWidgets.QLabel(self.bottomfm)
-        self.compicon.setGeometry(QtCore.QRect(10, 10, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
-        )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.compicon.sizePolicy().hasHeightForWidth())
-        self.compicon.setSizePolicy(sizePolicy)
-        self.compicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.compicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.compicon.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.compicon.setStyleSheet("border: none; background-color: rgba(0,0,0,0);")
-        self.compicon.setText("")
-        self.compicon.setPixmap(QtGui.QPixmap(":/mainwind/images/comp.png"))
-        self.compicon.setScaledContents(True)
-        self.compicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.compicon.setObjectName("compicon")
         self.userhost = QtWidgets.QLabel(self.bottomfm)
         self.userhost.setGeometry(QtCore.QRect(40, 5, 320, 15))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -3187,8 +3166,9 @@ class Ui_mainwind(object):
         self.compbutn.setMinimumSize(QtCore.QSize(30, 30))
         self.compbutn.setMaximumSize(QtCore.QSize(30, 30))
         self.compbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.compbutn.setStyleSheet("background-color: #008080; border: none;")
-        self.compbutn.setText("")
+        self.compbutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
+        )
         self.compbutn.setDefault(False)
         self.compbutn.setFlat(False)
         self.compbutn.setObjectName("compbutn")
@@ -3242,29 +3222,12 @@ class Ui_mainwind(object):
         self.swapbutn.setMinimumSize(QtCore.QSize(30, 30))
         self.swapbutn.setMaximumSize(QtCore.QSize(30, 30))
         self.swapbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.swapbutn.setStyleSheet("background-color: #008080;")
-        self.swapbutn.setText("")
+        self.swapbutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
+        )
         self.swapbutn.setDefault(False)
         self.swapbutn.setFlat(False)
         self.swapbutn.setObjectName("swapbutn")
-        self.swapicon = QtWidgets.QLabel(self.swapfrme)
-        self.swapicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
-        )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.swapicon.sizePolicy().hasHeightForWidth())
-        self.swapicon.setSizePolicy(sizePolicy)
-        self.swapicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.swapicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.swapicon.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.swapicon.setStyleSheet("border: none; background-color: rgba(0,0,0,0);")
-        self.swapicon.setText("")
-        self.swapicon.setPixmap(QtGui.QPixmap(":/mainwind/images/swap.png"))
-        self.swapicon.setScaledContents(True)
-        self.swapicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.swapicon.setObjectName("swapicon")
         self.swapperc = QtWidgets.QLabel(self.swapfrme)
         self.swapperc.setGeometry(QtCore.QRect(35, 5, 60, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -3320,29 +3283,12 @@ class Ui_mainwind(object):
         self.diskbutn.setMinimumSize(QtCore.QSize(30, 30))
         self.diskbutn.setMaximumSize(QtCore.QSize(30, 30))
         self.diskbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.diskbutn.setStyleSheet("background-color: #008080;")
-        self.diskbutn.setText("")
+        self.diskbutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
+        )
         self.diskbutn.setDefault(False)
         self.diskbutn.setFlat(False)
         self.diskbutn.setObjectName("diskbutn")
-        self.diskicon = QtWidgets.QLabel(self.diskfrme)
-        self.diskicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
-        )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.diskicon.sizePolicy().hasHeightForWidth())
-        self.diskicon.setSizePolicy(sizePolicy)
-        self.diskicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.diskicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.diskicon.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.diskicon.setStyleSheet("border: none; background-color: rgba(0,0,0,0);")
-        self.diskicon.setText("")
-        self.diskicon.setPixmap(QtGui.QPixmap(":/mainwind/images/disk.png"))
-        self.diskicon.setScaledContents(True)
-        self.diskicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.diskicon.setObjectName("diskicon")
         self.diskperc = QtWidgets.QLabel(self.diskfrme)
         self.diskperc.setGeometry(QtCore.QRect(35, 5, 60, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -3398,29 +3344,12 @@ class Ui_mainwind(object):
         self.memobutn.setMinimumSize(QtCore.QSize(30, 30))
         self.memobutn.setMaximumSize(QtCore.QSize(30, 30))
         self.memobutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.memobutn.setStyleSheet("background-color: #008080;")
-        self.memobutn.setText("")
+        self.memobutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
+        )
         self.memobutn.setDefault(False)
         self.memobutn.setFlat(False)
         self.memobutn.setObjectName("memobutn")
-        self.memoicon = QtWidgets.QLabel(self.memofrme)
-        self.memoicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
-        )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.memoicon.sizePolicy().hasHeightForWidth())
-        self.memoicon.setSizePolicy(sizePolicy)
-        self.memoicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.memoicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.memoicon.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.memoicon.setStyleSheet("border: none; background-color: rgba(0,0,0,0);")
-        self.memoicon.setText("")
-        self.memoicon.setPixmap(QtGui.QPixmap(":/mainwind/images/memo.png"))
-        self.memoicon.setScaledContents(True)
-        self.memoicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.memoicon.setObjectName("memoicon")
         self.memoperc = QtWidgets.QLabel(self.memofrme)
         self.memoperc.setGeometry(QtCore.QRect(35, 5, 60, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -3476,29 +3405,12 @@ class Ui_mainwind(object):
         self.cpudbutn.setMinimumSize(QtCore.QSize(30, 30))
         self.cpudbutn.setMaximumSize(QtCore.QSize(30, 30))
         self.cpudbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.cpudbutn.setStyleSheet("background-color: #008080;")
-        self.cpudbutn.setText("")
+        self.cpudbutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
+        )
         self.cpudbutn.setDefault(False)
         self.cpudbutn.setFlat(False)
         self.cpudbutn.setObjectName("cpudbutn")
-        self.cpudicon = QtWidgets.QLabel(self.cpudfrme)
-        self.cpudicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
-        )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.cpudicon.sizePolicy().hasHeightForWidth())
-        self.cpudicon.setSizePolicy(sizePolicy)
-        self.cpudicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.cpudicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.cpudicon.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-        self.cpudicon.setStyleSheet("border: none; background-color: rgba(0,0,0,0);")
-        self.cpudicon.setText("")
-        self.cpudicon.setPixmap(QtGui.QPixmap(":/mainwind/images/cpud.png"))
-        self.cpudicon.setScaledContents(True)
-        self.cpudicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.cpudicon.setObjectName("cpudicon")
         self.cpudperc = QtWidgets.QLabel(self.cpudfrme)
         self.cpudperc.setGeometry(QtCore.QRect(35, 5, 60, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -3525,7 +3437,6 @@ class Ui_mainwind(object):
         )
         self.cpudperc.setObjectName("cpudperc")
         self.compbutn.raise_()
-        self.compicon.raise_()
         self.userhost.raise_()
         self.kernvers.raise_()
         self.swapfrme.raise_()
@@ -3708,6 +3619,7 @@ class Ui_mainwind(object):
         self.maintabw.setTabText(
             self.maintabw.indexOf(self.infotabp), _translate("mainwind", "Information")
         )
+        self.cntbicon.setText(_translate("mainwind", "tachometer-alt"))
         self.cntbhead.setText(_translate("mainwind", "Obserware"))
         self.cntbvers.setText(_translate("mainwind", "Version VERSNUMB"))
         self.cntbtext.setText(
@@ -3721,15 +3633,18 @@ class Ui_mainwind(object):
             self.maintabw.indexOf(self.cntbtabp), _translate("mainwind", "Contribute")
         )
         self.userhost.setText(_translate("mainwind", "username@hostname"))
+        self.compbutn.setText(_translate("mainwind", "laptop"))
         self.kernvers.setText(
             _translate("mainwind", "Kernel A.BB.CC-DDD.xxYY.ARCHITECTURE")
         )
+        self.swapbutn.setText(_translate("mainwind", "copy"))
         self.swapperc.setText(_translate("mainwind", "000.0"))
+        self.diskbutn.setText(_translate("mainwind", "hdd"))
         self.diskperc.setText(_translate("mainwind", "000.0"))
+        self.memobutn.setText(_translate("mainwind", "memory"))
         self.memoperc.setText(_translate("mainwind", "000.0"))
+        self.cpudbutn.setText(_translate("mainwind", "microchip"))
         self.cpudperc.setText(_translate("mainwind", "000.0"))
 
 
 from PyQt5.QtChart import QChartView
-
-from . import resources
diff --git a/obserware/sources/screens/procwind/interface.py b/obserware/sources/screens/procwind/interface.py
index 9a267f6..9f1976f 100644
--- a/obserware/sources/screens/procwind/interface.py
+++ b/obserware/sources/screens/procwind/interface.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'obserware/assets/uifiles/procwind.ui'
+# Form implementation generated from reading ui file 'assets/uifiles/procwind.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.6
 #
@@ -80,26 +80,10 @@ class Ui_procwind(object):
         self.pcidbutn.setSizePolicy(sizePolicy)
         self.pcidbutn.setMinimumSize(QtCore.QSize(30, 30))
         self.pcidbutn.setMaximumSize(QtCore.QSize(30, 30))
-        self.pcidbutn.setStyleSheet("background-color: #008080;")
-        self.pcidbutn.setText("")
-        self.pcidbutn.setObjectName("pcidbutn")
-        self.pcidicon = QtWidgets.QLabel(self.pcidfrme)
-        self.pcidicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
+        self.pcidbutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
         )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pcidicon.sizePolicy().hasHeightForWidth())
-        self.pcidicon.setSizePolicy(sizePolicy)
-        self.pcidicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.pcidicon.setMaximumSize(QtCore.QSize(20, 16777215))
-        self.pcidicon.setStyleSheet("background-color: rgba(0,0,0,0);")
-        self.pcidicon.setText("")
-        self.pcidicon.setPixmap(QtGui.QPixmap(":/procwind/images/tack.png"))
-        self.pcidicon.setScaledContents(True)
-        self.pcidicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.pcidicon.setObjectName("pcidicon")
+        self.pcidbutn.setObjectName("pcidbutn")
         self.pcidtext = QtWidgets.QLabel(self.pcidfrme)
         self.pcidtext.setGeometry(QtCore.QRect(35, 5, 270, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -162,26 +146,10 @@ class Ui_procwind(object):
         self.cpudbutn.setSizePolicy(sizePolicy)
         self.cpudbutn.setMinimumSize(QtCore.QSize(30, 30))
         self.cpudbutn.setMaximumSize(QtCore.QSize(30, 30))
-        self.cpudbutn.setStyleSheet("background-color: #008080;")
-        self.cpudbutn.setText("")
-        self.cpudbutn.setObjectName("cpudbutn")
-        self.cpudicon = QtWidgets.QLabel(self.cpudfrme)
-        self.cpudicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
+        self.cpudbutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
         )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.cpudicon.sizePolicy().hasHeightForWidth())
-        self.cpudicon.setSizePolicy(sizePolicy)
-        self.cpudicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.cpudicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.cpudicon.setStyleSheet("background-color: rgba(0,0,0,0);")
-        self.cpudicon.setText("")
-        self.cpudicon.setPixmap(QtGui.QPixmap(":/procwind/images/cpud.png"))
-        self.cpudicon.setScaledContents(True)
-        self.cpudicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.cpudicon.setObjectName("cpudicon")
+        self.cpudbutn.setObjectName("cpudbutn")
         self.cpudtext = QtWidgets.QLabel(self.cpudfrme)
         self.cpudtext.setGeometry(QtCore.QRect(35, 5, 110, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -229,26 +197,10 @@ class Ui_procwind(object):
         self.memobutn.setSizePolicy(sizePolicy)
         self.memobutn.setMinimumSize(QtCore.QSize(30, 30))
         self.memobutn.setMaximumSize(QtCore.QSize(30, 30))
-        self.memobutn.setStyleSheet("background-color: #008080;")
-        self.memobutn.setText("")
-        self.memobutn.setObjectName("memobutn")
-        self.memoicon = QtWidgets.QLabel(self.memofrme)
-        self.memoicon.setGeometry(QtCore.QRect(5, 5, 20, 20))
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
+        self.memobutn.setStyleSheet(
+            'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;'
         )
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.memoicon.sizePolicy().hasHeightForWidth())
-        self.memoicon.setSizePolicy(sizePolicy)
-        self.memoicon.setMinimumSize(QtCore.QSize(20, 20))
-        self.memoicon.setMaximumSize(QtCore.QSize(20, 20))
-        self.memoicon.setStyleSheet("background-color: rgba(0,0,0,0);")
-        self.memoicon.setText("")
-        self.memoicon.setPixmap(QtGui.QPixmap(":/procwind/images/memo.png"))
-        self.memoicon.setScaledContents(True)
-        self.memoicon.setAlignment(QtCore.Qt.AlignCenter)
-        self.memoicon.setObjectName("memoicon")
+        self.memobutn.setObjectName("memobutn")
         self.memotext = QtWidgets.QLabel(self.memofrme)
         self.memotext.setGeometry(QtCore.QRect(35, 5, 110, 20))
         sizePolicy = QtWidgets.QSizePolicy(
@@ -879,8 +831,11 @@ class Ui_procwind(object):
         _translate = QtCore.QCoreApplication.translate
         procwind.setWindowTitle(_translate("procwind", "MainWindow"))
         self.procname.setText(_translate("procwind", "PROCESS_NAME"))
+        self.pcidbutn.setText(_translate("procwind", "thumbtack"))
         self.pcidtext.setText(_translate("procwind", "0"))
+        self.cpudbutn.setText(_translate("procwind", "microchip"))
         self.cpudtext.setText(_translate("procwind", "0%"))
+        self.memobutn.setText(_translate("procwind", "memory"))
         self.memotext.setText(_translate("procwind", "0%"))
         self.procccnm.setText(_translate("procwind", "0"))
         self.proccclb.setText(_translate("procwind", "CPU count"))
@@ -911,6 +866,3 @@ class Ui_procwind(object):
         self.procklbt.setText(_translate("procwind", "Kill"))
         self.procspbt.setText(_translate("procwind", "Suspend"))
         self.procrsbt.setText(_translate("procwind", "Resume"))
-
-
-from . import resources