diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index 22e34cfb840926edaba1dc6fddc2e06d6a10ffea..44209fbc918cbcd83a496741987456d415d69724 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -198,7 +198,13 @@ create_main_window ()
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
 
 	widget = create_toolbar_actions (ui_manager);
-	gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
+	// Do not override GNOME user settings
+	// gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+	
+	widget = create_toolbar_windows (ui_manager);
+	// Do not override GNOME user settings
+	//gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
 
 	gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
@@ -211,10 +217,6 @@ create_main_window ()
 	gtk_box_pack_start(GTK_BOX(subvbox),
 			GTK_WIDGET(embedded_error_notebook), FALSE, FALSE, 0);
 
-	widget = create_toolbar_windows (ui_manager);
-	gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
-	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-
 	if(SHOW_VOLUME){
 		speaker_control = create_slider("speaker");
 		gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
diff --git a/sflphone-client-gnome/src/mainwindow.h b/sflphone-client-gnome/src/mainwindow.h
index aea6763bcff63ea1dd6ec2b776b3f4b30730173a..323c0893a976573c95e7b374002251c9a83f634e 100644
--- a/sflphone-client-gnome/src/mainwindow.h
+++ b/sflphone-client-gnome/src/mainwindow.h
@@ -24,7 +24,7 @@
 #include <calltree.h>
 #include <uimanager.h>
 
-#define MAIN_WINDOW_WIDTH 400
+#define MAIN_WINDOW_WIDTH 350
 #define MAIN_WINDOW_HEIGHT 320
 
 /** @file mainwindow.h