diff --git a/src/images/cpu.png b/src/images/cpu.png
deleted file mode 120000
index da5cf88..0000000
--- a/src/images/cpu.png
+++ /dev/null
@@ -1 +0,0 @@
-Lubuntu.png
\ No newline at end of file
diff --git a/src/images/graphics.png b/src/images/graphics.png
deleted file mode 120000
index da5cf88..0000000
--- a/src/images/graphics.png
+++ /dev/null
@@ -1 +0,0 @@
-Lubuntu.png
\ No newline at end of file
diff --git a/src/images/hostname.png b/src/images/hostname.png
deleted file mode 120000
index da5cf88..0000000
--- a/src/images/hostname.png
+++ /dev/null
@@ -1 +0,0 @@
-Lubuntu.png
\ No newline at end of file
diff --git a/src/images/memory.png b/src/images/memory.png
deleted file mode 120000
index da5cf88..0000000
--- a/src/images/memory.png
+++ /dev/null
@@ -1 +0,0 @@
-Lubuntu.png
\ No newline at end of file
diff --git a/src/main.ui b/src/main.ui
index e91a340..fbb328d 100644
--- a/src/main.ui
+++ b/src/main.ui
@@ -45,6 +45,81 @@
       </size>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="5" column="0">
+       <spacer name="verticalSpacer3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="11" column="0" colspan="4">
+       <layout class="QHBoxLayout" name="buttonslayout">
+        <item>
+         <widget class="QPushButton" name="translation">
+          <property name="minimumSize">
+           <size>
+            <width>100</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>100</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Translation</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="license">
+          <property name="minimumSize">
+           <size>
+            <width>100</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>100</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>License</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="buttonspacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QDialogButtonBox" name="close">
+          <property name="standardButtons">
+           <set>QDialogButtonBox::Close</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item row="1" column="0" rowspan="4" colspan="4">
        <layout class="QGridLayout" name="itemcontainer">
         <item row="0" column="0">
@@ -128,26 +203,104 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <spacer name="verticalSpacer2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="9" column="0">
+       <spacer name="verticalSpacer1">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="8" column="0">
        <layout class="QVBoxLayout" name="specs">
         <item>
          <layout class="QHBoxLayout" name="hostname">
           <item>
-           <widget class="QLabel" name="hostnameicon">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
+           <widget class="QPushButton" name="hostnameicon">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="maximumSize">
+            <property name="palette">
+             <palette>
+              <active>
+               <colorrole role="Highlight">
+                <brush brushstyle="SolidPattern">
+                 <color alpha="255">
+                  <red>61</red>
+                  <green>174</green>
+                  <blue>233</blue>
+                 </color>
+                </brush>
+               </colorrole>
+              </active>
+              <inactive>
+               <colorrole role="Highlight">
+                <brush brushstyle="SolidPattern">
+                 <color alpha="255">
+                  <red>194</red>
+                  <green>224</green>
+                  <blue>245</blue>
+                 </color>
+                </brush>
+               </colorrole>
+              </inactive>
+              <disabled>
+               <colorrole role="Highlight">
+                <brush brushstyle="SolidPattern">
+                 <color alpha="255">
+                  <red>61</red>
+                  <green>174</green>
+                  <blue>233</blue>
+                 </color>
+                </brush>
+               </colorrole>
+              </disabled>
+             </palette>
+            </property>
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset theme="computer"/>
+            </property>
+            <property name="iconSize">
              <size>
               <width>32</width>
               <height>32</height>
              </size>
             </property>
-            <property name="text">
-             <string>&lt;img src=&quot;:/images/hostname.png&quot; height=&quot;32&quot; width=&quot;32&quot; /&gt;</string>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <property name="autoExclusive">
+             <bool>false</bool>
+            </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -182,21 +335,24 @@
         <item>
          <layout class="QHBoxLayout" name="cpu">
           <item>
-           <widget class="QLabel" name="cpuicon">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
+           <widget class="QPushButton" name="cpuicon">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="maximumSize">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset theme="cpu"/>
+            </property>
+            <property name="iconSize">
              <size>
               <width>32</width>
               <height>32</height>
              </size>
             </property>
-            <property name="text">
-             <string>&lt;img src=&quot;:/images/cpu.png&quot; height=&quot;32&quot; width=&quot;32&quot; /&gt;</string>
+            <property name="flat">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -231,21 +387,24 @@
         <item>
          <layout class="QHBoxLayout" name="memory">
           <item>
-           <widget class="QLabel" name="memoryicon">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
+           <widget class="QPushButton" name="pushButton_2">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="maximumSize">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset theme="media-flash"/>
+            </property>
+            <property name="iconSize">
              <size>
               <width>32</width>
               <height>32</height>
              </size>
             </property>
-            <property name="text">
-             <string>&lt;img src=&quot;:/images/memory.png&quot; height=&quot;32&quot; width=&quot;32&quot; /&gt;</string>
+            <property name="flat">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -280,21 +439,27 @@
         <item>
          <layout class="QHBoxLayout" name="graphics">
           <item>
-           <widget class="QLabel" name="graphicsicon">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
+           <widget class="QPushButton" name="pushButton">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="maximumSize">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset theme="video-display"/>
+            </property>
+            <property name="iconSize">
              <size>
               <width>32</width>
               <height>32</height>
              </size>
             </property>
-            <property name="text">
-             <string>&lt;img src=&quot;:/images/graphics.png&quot; height=&quot;32&quot; width=&quot;32&quot; /&gt;</string>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -328,107 +493,6 @@
         </item>
        </layout>
       </item>
-      <item row="11" column="0" colspan="4">
-       <layout class="QHBoxLayout" name="buttonslayout">
-        <item>
-         <widget class="QPushButton" name="translation">
-          <property name="minimumSize">
-           <size>
-            <width>100</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>100</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Translation</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="license">
-          <property name="minimumSize">
-           <size>
-            <width>100</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>100</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>License</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="buttonspacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QDialogButtonBox" name="close">
-          <property name="standardButtons">
-           <set>QDialogButtonBox::Close</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="9" column="0">
-       <spacer name="verticalSpacer1">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="5" column="0">
-       <spacer name="verticalSpacer3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0">
-       <spacer name="verticalSpacer2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>