diff --git a/data/entry_page.ui b/data/entry_page.ui
index 22d6c8fa..b943f682 100644
--- a/data/entry_page.ui
+++ b/data/entry_page.ui
@@ -93,6 +93,1524 @@
False
15
15
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ network-wired-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-warning-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ network-server-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ document-edit-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ media-view-subtitles-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ application-x-addon-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ accessories-text-editor-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ network-wired-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ mail-send-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ text-x-generic-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ camera-photo-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ network-wireless-signal-excellent-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ colorimeter-colorhug-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ scanner-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ network-wired-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ media-optical-cd-audio-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ video-display-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ mail-unread-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ emblem-system-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ edit-paste-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ edit-paste-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ preferences-desktop-remote-desktop-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ uninterruptible-power-supply-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ mail-unread-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ media-floppy-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ drive-harddisk-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ utilities-terminal-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ printer-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ image-x-generic-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ edit-select-all-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ preferences-system-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ network-workgroup-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ drive-harddisk-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ document-open-recent-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ system-search-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ media-flash-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ user-trash-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ accessories-text-editor-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ edit-delete-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-question-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ package-x-generic-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ folder-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ folder-open-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ document-open-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ system-lock-screen-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ rotation-locked-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ object-select-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ document-edit-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ image-x-generic-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ accessories-dictionary-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ view-list-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ avatar-default-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ applications-engineering-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ go-home-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ starred-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ start-here-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ start-here-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ accessories-dictionary-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ dialog-password-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ application-certificate-symbolic
+
+
+
+
+
+
+ 16
+ 16
+ True
+ True
+ start
+ start
+ 4
+ 4
+ 4
+ 4
+
+
+ True
+ False
+ 16
+ phone-apple-iphone-symbolic
+
+
+
+
@@ -115,8 +1633,8 @@
- 10
- 20
+ 16
+ 16
True
True
start
diff --git a/keepassgtk/unlocked_database.py b/keepassgtk/unlocked_database.py
index 534bde34..ae563b33 100644
--- a/keepassgtk/unlocked_database.py
+++ b/keepassgtk/unlocked_database.py
@@ -680,16 +680,6 @@ def insert_entry_properties_into_listbox(self, properties_list_box, add_all):
scrolled_page.icon_property_row = builder.get_object("icon_property_row")
scrolled_page.iconview_flowbox = builder.get_object("iconview_flowbox")
- iconview_icon = builder.get_object("iconview_icon")
-
- for icon in keepassgtk.icon.icon_list.values():
- nbuilder = Gtk.Builder()
- nbuilder.add_from_resource("/run/terminal/KeepassGtk/entry_page.ui")
- iconview_icon = nbuilder.get_object("iconview_icon")
- image = iconview_icon.get_children()[0]
- image.set_from_icon_name(icon, 32)
- scrolled_page.iconview_flowbox.add(iconview_icon)
-
scrolled_page.iconview_flowbox.connect("child-activated", self.on_icon_view_item_selected)
properties_list_box.add(scrolled_page.icon_property_row)