diff --git a/gsmartcontrol/configure.ac b/gsmartcontrol/configure.ac
index 10d7416..a98d0cb 100644
--- a/gsmartcontrol/configure.ac
+++ b/gsmartcontrol/configure.ac
@@ -386,7 +386,7 @@ _AM_SUBST_NOTMAKE([RES_TARGETS])
 ADDITIONAL_FLAGS="-DPACKAGE_PKGDATA_DIR=\"\\\"\$(pkgdatadir)\\\"\" \
 -DPACKAGE_SYSCONF_DIR=\"\\\"\$(sysconfdir)\\\"\" \
 -DTOP_SRC_DIR=\"\\\"\$(top_srcdir)\\\"\" \
--DHZ_USE_GLOBAL_MACROS=1 -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-DHZ_USE_GLOBAL_MACROS=1"
 
 #CFLAGS="$CFLAGS $ADDITIONAL_FLAGS"
 CXXFLAGS="$CXXFLAGS $ADDITIONAL_FLAGS"
diff --git a/gsmartcontrol/src/gsc_main_window_iconview.h b/gsmartcontrol/src/gsc_main_window_iconview.h
index f86f8ad..628e05c 100644
--- a/gsmartcontrol/src/gsc_main_window_iconview.h
+++ b/gsmartcontrol/src/gsc_main_window_iconview.h
@@ -51,8 +51,6 @@ class GscMainWindowIconView : public Gtk::IconView {
 		GscMainWindowIconView(BaseObjectType* gtkcobj, const app_ui_res_ref_t& ref_ui)
 				: Gtk::IconView(gtkcobj), num_icons(0), main_window(0), empty_view_message(message_none)
 		{
-			APP_GTKMM_CONNECT_VIRTUAL(draw);  // make sure the event handler is called
-
 			columns.add(col_name);  // we can use the col_name variable by value after this.
 			this->set_markup_column(col_name);
 
@@ -151,16 +149,10 @@ class GscMainWindowIconView : public Gtk::IconView {
 		}
 
 
-		/// Overridden from Gtk::Widget
-		bool on_draw_before(Cairo::RefPtr<Cairo::Context> cr)
+		// Overridden from Gtk::Widget
+		bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
 		{
-// TODO Implement in cairo
-/*
 			if (empty_view_message != message_none && this->num_icons == 0) {  // no icons
-				Glib::RefPtr<Gdk::Drawable> win = Glib::wrap(exp_event->window, true);
-	// 			Cairo::RefPtr<Cairo::Context> cr = win->create_cairo_context();
-				Glib::RefPtr<Gdk::GC> gc = Gdk::GC::create(win);
-
 				std::string msg;
 				switch(empty_view_message) {
 					case message_scan_disabled: msg = "Automatic scanning is disabled.\nPress Ctrl+R to scan manually."; break;
@@ -171,7 +163,7 @@ class GscMainWindowIconView : public Gtk::IconView {
 					default: msg = "[error - invalid message]";
 				}
 
-				Glib::RefPtr<Pango::Layout> layout = create_pango_layout("");
+				Glib::RefPtr<Pango::Layout> layout = this->create_pango_layout("");
 				layout->set_alignment(Pango::ALIGN_CENTER);
 				layout->set_markup(msg);
 
@@ -180,11 +172,14 @@ class GscMainWindowIconView : public Gtk::IconView {
 
 				int pos_x = (get_allocation().get_width() - layout_w) / 2;
 				int pos_y = (get_allocation().get_height() - layout_h) / 2;
+				cr->move_to(pos_x, pos_y);
 
-				win->draw_layout(gc, pos_x, pos_y, layout);
+				layout->show_in_cairo_context(cr);
+
+				return true;
 			}
-*/
-			return false;  // without false the icons don't get drawn...
+
+			return Gtk::IconView::on_draw(cr);
 		}
 
 
diff --git a/gsmartcontrol/src/res/gsc_info_window.ui b/gsmartcontrol/src/res/gsc_info_window.ui
index 4908b87..2450550 100644
--- a/gsmartcontrol/src/res/gsc_info_window.ui
+++ b/gsmartcontrol/src/res/gsc_info_window.ui
@@ -93,6 +93,27 @@
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -109,7 +130,7 @@
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
                     <property name="tooltip_text" translatable="yes">Drive identity and general health information</property>
-                    <property name="label" translatable="yes">_Identity</property>
+                    <property name="label" translatable="yes">_General</property>
                     <property name="use_markup">True</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -903,8 +924,8 @@ Selective self-test log is also presented here.</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes">Re-read all the information</property>
                 <property name="use_stock">True</property>
-                <accelerator key="F5" signal="clicked"/>
                 <accelerator key="R" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                <accelerator key="F5" signal="clicked"/>
               </object>
               <packing>
                 <property name="expand">True</property>