diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 318ac88..56123a5 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -13,7 +13,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
 
 set(SOURCE_FILES
         ubl-settings-manager.c
-        ubl-settings-manager.h)
+        ubl-settings-manager.h
+        ui/ubl-settings-manager.glade
+        css/ubl-settings-manager.css)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
@@ -22,4 +24,8 @@ set(LIBRARIES
 
 add_executable(ubl-settings-manager ${SOURCE_FILES})
 target_link_libraries(ubl-settings-manager ${LIBRARIES})
+
+file(COPY ui DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY css DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 install(TARGETS ubl-settings-manager DESTINATION bin)
\ No newline at end of file
diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c
index dfe83a4..e0c53cd 100644
--- a/source/ubl-settings-manager.c
+++ b/source/ubl-settings-manager.c
@@ -1540,7 +1540,7 @@ int main(int argc, char *argv[]){
             load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize);
         }
         yon_show_icon_views(widg->ICSys,widg);
-        gtk_overlay_add_overlay(GTK_OVERLAY(widg->Overlay),GTK_WIDGET(gtk_builder_get_object(builder,"GnomeScroll")));
+        gtk_overlay_add_overlay(GTK_OVERLAY(widg->Overlay),widg->workingwindow);
         theme="Gnome";
         main_config.WindowTheme=1;
         widgets->next=yon_dictionary_create_empty();
@@ -1555,7 +1555,7 @@ int main(int argc, char *argv[]){
             load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize);
         }
         yon_show_icon_views(widg->ICSys,widg);
-        gtk_overlay_add_overlay(GTK_OVERLAY(widg->Overlay),widg->icvpack);
+        gtk_overlay_add_overlay(GTK_OVERLAY(widg->Overlay),GTK_WIDGET(gtk_builder_get_object(builder,"GnomeScroll")));
         main_config.WindowTheme=0;
         yon_icv_resize_item(widg->ICSys,widg->GnomePaned);
     }
diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade
index 8566978..5deadd5 100644
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@@ -430,15 +430,7 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkIconView">
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="margin">6</property>
-      </object>
-      <packing>
-        <property name="pass-through">True</property>
-        <property name="index">-1</property>
-      </packing>
+      <placeholder/>
     </child>
   </object>
   <object class="GtkAdjustment" id="adjustment1">
@@ -527,6 +519,7 @@
                         <property name="height-request">64</property>
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
+                        <property name="icon-name">ublinux-ubconfig</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1376,7 +1369,7 @@
           <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="pixbuf">../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg</property>
+            <property name="icon-name">ublinux-ubconfig</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -1576,7 +1569,7 @@
           <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="pixbuf">../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg</property>
+            <property name="icon-name">ublinux-ubconfig</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -1752,7 +1745,7 @@
           <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="pixbuf">../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg</property>
+            <property name="icon-name">ublinux-ubconfig</property>
             <property name="icon_size">5</property>
           </object>
         </child>