diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 5a77eed29..1dc948497 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -8548,7 +8548,7 @@ Custom</property>
 			  <property name="tooltip" translatable="yes">Bold</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NONE</property>
-			  <property name="focus_on_click">True</property>
+			  <property name="focus_on_click">False</property>
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 
@@ -8577,7 +8577,7 @@ Custom</property>
 			  <property name="tooltip" translatable="yes">Italic</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NONE</property>
-			  <property name="focus_on_click">True</property>
+			  <property name="focus_on_click">False</property>
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 
@@ -8606,7 +8606,7 @@ Custom</property>
 			  <property name="tooltip" translatable="yes">Underline</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NONE</property>
-			  <property name="focus_on_click">True</property>
+			  <property name="focus_on_click">False</property>
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 
@@ -8720,6 +8720,7 @@ Custom</property>
 		      <child>
 			<widget class="GtkButton" id="history_button">
 			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Click to see past conversation in this room</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -9825,7 +9826,7 @@ Custom</property>
 			  <property name="ypad">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">3</property>
+			  <property name="padding">5</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
@@ -9877,7 +9878,7 @@ JID: whatever@jabber.org</property>
 			  <property name="ypad">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">3</property>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
@@ -10066,7 +10067,7 @@ JID: whatever@jabber.org</property>
 		      <property name="tooltip" translatable="yes">Bold</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
-		      <property name="focus_on_click">True</property>
+		      <property name="focus_on_click">False</property>
 		      <property name="active">False</property>
 		      <property name="inconsistent">False</property>
 
@@ -10095,7 +10096,7 @@ JID: whatever@jabber.org</property>
 		      <property name="tooltip" translatable="yes">Italic</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
-		      <property name="focus_on_click">True</property>
+		      <property name="focus_on_click">False</property>
 		      <property name="active">False</property>
 		      <property name="inconsistent">False</property>
 
@@ -10124,7 +10125,7 @@ JID: whatever@jabber.org</property>
 		      <property name="tooltip" translatable="yes">Underline</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
-		      <property name="focus_on_click">True</property>
+		      <property name="focus_on_click">False</property>
 		      <property name="active">False</property>
 		      <property name="inconsistent">False</property>