diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py
index 154e737..c07ffc8 100644
--- a/src/manjaro_hello.py
+++ b/src/manjaro_hello.py
@@ -41,13 +41,23 @@ class Hello():
         # Subtitle of headerbar
         self.builder.get_object("headerbar").props.subtitle = self.preferences["system"]
 
-        # Load logo
+        # Load images
         if os.path.isfile(self.preferences["logo_path"]):
             logo = GdkPixbuf.Pixbuf.new_from_file(self.preferences["logo_path"])
             self.window.set_icon(logo)
             self.builder.get_object("distriblogo").set_from_pixbuf(logo)
             self.builder.get_object("aboutdialog").set_logo(logo)
 
+        for btn in self.builder.get_object("social").get_children():
+            icon_path = self.preferences["data_path"] + "img/" + btn.get_name() + ".png"
+            self.builder.get_object(btn.get_name()).set_from_file(icon_path)
+
+        for widget in self.builder.get_object("homepage").get_children():
+            if isinstance(widget, Gtk.Button) and widget.get_image_position() is Gtk.PositionType.RIGHT:
+                img = Gtk.Image.new_from_file(self.preferences["data_path"] + "img/external-link.png")
+                img.set_margin_left(2)
+                widget.set_image(img)
+
         # Create pages
         self.pages = os.listdir("{}/pages/{}".format(self.preferences["data_path"],
                                                         self.preferences["default_locale"]))
@@ -66,16 +76,6 @@ class Hello():
         gettext.textdomain(self.app)
         self.builder.get_object("languages").set_active_id(self.get_best_locale())
 
-        # Load images
-        for btn in self.builder.get_object("social").get_children():
-            icon_path = self.preferences["data_path"] + "img/" + btn.get_name() + ".png"
-            self.builder.get_object(btn.get_name()).set_from_file(icon_path)
-
-        for btn in ("wiki", "forum", "chat", "mailling", "development", "donate"):
-            img = Gtk.Image.new_from_file(self.preferences["data_path"] + "img/external-link.png")
-            img.set_margin_left(2)
-            self.builder.get_object(btn).set_image(img)
-
         # Set autostart switcher state
         self.autostart = os.path.isfile(self.preferences["autostart_path"])
         self.builder.get_object("autostart").set_active(self.autostart)
diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade
index 0f18755..a853c9c 100644
--- a/ui/manjaro-hello.glade
+++ b/ui/manjaro-hello.glade
@@ -25,7 +25,7 @@
         <property name="hexpand">True</property>
         <property name="transition_type">crossfade</property>
         <child>
-          <object class="GtkGrid">
+          <object class="GtkGrid" id="homepage">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">10</property>
@@ -144,7 +144,6 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="image_position">right</property>
                 <property name="always_show_image">True</property>
                 <signal name="clicked" handler="on_btn_clicked" swapped="no"/>
               </object>