diff --git a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
index ee3235e..be8a5d0 100644
--- a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
+++ b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
@@ -156,11 +156,11 @@
             self.on_entry_changed = self.on_entry_changed_embedded
             self._widgets.content.reorder_child(self._widgets.infobar, 0)
         elif self.mode == WindowMode.GtkHeader:
-            self._widgets.buttons.remove(self._widgets.apply)
-            self._widgets.buttons.remove(self._widgets.reload)
+            for button in (self._widgets.apply, self._widgets.reload):
+                self._widgets.buttons.remove(button)
+                button.set_label('')
+                button.set_always_show_image(True)
             self._widgets.buttons.hide()
-            self._widgets.apply.set_label('')
-            self._widgets.reload.set_label('')
 
             header = Gtk.HeaderBar()
             header.set_show_close_button(True)
diff --git a/lightdm_gtk_greeter_settings/__init__.py b/lightdm_gtk_greeter_settings/__init__.py
index d161faf..ade8cd5 100644
--- a/lightdm_gtk_greeter_settings/__init__.py
+++ b/lightdm_gtk_greeter_settings/__init__.py
@@ -17,13 +17,15 @@
 
 
 def main():
+    import argparse
+    import locale
+    import os
+
     from gi.repository import Gtk
     from lightdm_gtk_greeter_settings import helpers
     from lightdm_gtk_greeter_settings import GtkGreeterSettingsWindow
     from lightdm_gtk_greeter_settings.GtkGreeterSettingsWindow import WindowMode
 
-    import argparse
-    import locale
     locale.textdomain('lightdm-gtk-greeter-settings')
 
     parser = argparse.ArgumentParser(description='LightDM Gtk+ Greeter settings editor')