diff --git a/httpupload/httpupload.py b/httpupload/httpupload.py
index 22c29b4..be665ea 100644
--- a/httpupload/httpupload.py
+++ b/httpupload/httpupload.py
@@ -117,6 +117,8 @@ class HTTPUploadPlugin(GajimPlugin):
         if jid not in interface.controls:
             return
         actions_hbox = chat_control.xml.get_object('actions_hbox')
+        if actions_hbox is None:
+            actions_hbox = chat_control.xml.get_object('hbox')
         actions_hbox.remove(interface.controls[jid])
 
     def update_chat_control(self, chat_control):
@@ -152,6 +154,11 @@ class Base(object):
         button.set_image(img)
         button.set_relief(Gtk.ReliefStyle.NONE)
 
+        if actions_hbox is None:
+            actions_hbox = chat_control.xml.get_object('hbox')
+            style = button.get_style_context()
+            style.add_class('chatcontrol-actionbar-button')
+
         actions_hbox.add(button)
 
         self.controls[jid] = button