diff --git a/install/static/Makefile.am b/install/static/Makefile.am
index 362b7d05b..ef16a2e99 100644
--- a/install/static/Makefile.am
+++ b/install/static/Makefile.am
@@ -9,10 +9,6 @@ appdir = $(IPA_DATA_DIR)/static
 app_DATA =                              \
 	add.js				\
 	associate.js			\
-	but-reset.png			\
-	but-update.png			\
-	but-selected.png		\
-	but-unselected.png		\
 	ipa_logo_180x50.png		\
 	ipa.js				\
 	ipa.css				\
@@ -59,28 +55,6 @@ app_DATA =                              \
 	ui-icons_ededed_256x240.png \
 	ui-icons_ffcf29_256x240.png \
 	ui-icons_ffffff_256x240.png \
-	group_details.png		\
-	host_details.png		\
-	hostgroup_details.png		\
-	netgroup_details.png		\
-	service_details.png		\
-	user_details.png		\
-	group_member.png		\
-	host_member.png			\
-	hostgroup_member.png		\
-	netgroup_member.png		\
-	service_member.png		\
-	user_member.png			\
-	group_enroll.png		\
-	host_enroll.png			\
-	hostgroup_enroll.png		\
-	netgroup_enroll.png		\
-	service_enroll.png		\
-	user_enroll.png			\
-	search.png			\
-	taskgroup_details.png		\
-	rolegroup_details.png		\
-	rolegroup_member.png		\
 	$(NULL)
 
 EXTRA_DIST =                            \
diff --git a/install/static/but-reset.png b/install/static/but-reset.png
deleted file mode 100644
index c2c4db1ed..000000000
Binary files a/install/static/but-reset.png and /dev/null differ
diff --git a/install/static/but-selected.png b/install/static/but-selected.png
deleted file mode 100644
index 9a42053a7..000000000
Binary files a/install/static/but-selected.png and /dev/null differ
diff --git a/install/static/but-unselected.png b/install/static/but-unselected.png
deleted file mode 100644
index ba9ed3327..000000000
Binary files a/install/static/but-unselected.png and /dev/null differ
diff --git a/install/static/but-update.png b/install/static/but-update.png
deleted file mode 100644
index 719b651b3..000000000
Binary files a/install/static/but-update.png and /dev/null differ
diff --git a/install/static/entity.js b/install/static/entity.js
index 913a751c1..9f3149bd5 100644
--- a/install/static/entity.js
+++ b/install/static/entity.js
@@ -208,13 +208,13 @@ function ipa_entity_generate_views(obj_name, container, switch_view)
         title: 'search',
         text: 'Search',
         click: switch_view
-    }).prepend('<img src="search.png"/>'));
+    }));
 
     ul.append($('<li></li>', {
         text: 'Details',
         title: 'details',
         click: switch_view
-    }).prepend('<img src="' + obj_name +'_details.png"/>'));
+    }).prepend('| '));
 
     var attribute_members = ipa_objs[obj_name].attribute_members;
     for (attr in attribute_members) {
@@ -227,7 +227,7 @@ function ipa_entity_generate_views(obj_name, container, switch_view)
                 title: m,
                 text:label,
                 click: switch_view
-            }).prepend('<img src="' + ipa_objs[m].name + '_member.png"/>'));
+            }).prepend('| '));
         }
     }
 
@@ -253,9 +253,7 @@ function ipa_entity_quick_links(tr, attr, value, entry_attrs) {
             nav_push_state(state);
             return false;
         }
-    }).append($('<img/>', {
-         src: obj_name+'_details.png'
-    })).appendTo(td);
+    }).appendTo(td);
 
     var attribute_members = ipa_objs[obj_name].attribute_members;
     for (attr_name in attribute_members) {
@@ -267,6 +265,7 @@ function ipa_entity_quick_links(tr, attr, value, entry_attrs) {
             $("<a/>", {
                 href: '#'+m,
                 title: label,
+                text: label,
                 click: function(m) {
                     return function() {
                         var state = {};
@@ -277,9 +276,7 @@ function ipa_entity_quick_links(tr, attr, value, entry_attrs) {
                         return false;
                     }
                 }(m)
-            }).append($('<img/>', {
-                src: m+'_member.png'
-            })).appendTo(td);
+            }).append(' | ' ).appendTo(td);
         }
     }
 }
diff --git a/install/static/group_details.png b/install/static/group_details.png
deleted file mode 100644
index c267398aa..000000000
Binary files a/install/static/group_details.png and /dev/null differ
diff --git a/install/static/group_enroll.png b/install/static/group_enroll.png
deleted file mode 100644
index ad6b1c1de..000000000
Binary files a/install/static/group_enroll.png and /dev/null differ
diff --git a/install/static/group_member.png b/install/static/group_member.png
deleted file mode 100644
index 4e754147b..000000000
Binary files a/install/static/group_member.png and /dev/null differ
diff --git a/install/static/host_details.png b/install/static/host_details.png
deleted file mode 100644
index 16f748a19..000000000
Binary files a/install/static/host_details.png and /dev/null differ
diff --git a/install/static/host_enroll.png b/install/static/host_enroll.png
deleted file mode 100644
index 3f3112dc0..000000000
Binary files a/install/static/host_enroll.png and /dev/null differ
diff --git a/install/static/host_member.png b/install/static/host_member.png
deleted file mode 100644
index 71bae959f..000000000
Binary files a/install/static/host_member.png and /dev/null differ
diff --git a/install/static/hostgroup_details.png b/install/static/hostgroup_details.png
deleted file mode 100644
index b376d883a..000000000
Binary files a/install/static/hostgroup_details.png and /dev/null differ
diff --git a/install/static/hostgroup_enroll.png b/install/static/hostgroup_enroll.png
deleted file mode 100644
index 0a8cafd6b..000000000
Binary files a/install/static/hostgroup_enroll.png and /dev/null differ
diff --git a/install/static/hostgroup_member.png b/install/static/hostgroup_member.png
deleted file mode 100644
index 8c18ded70..000000000
Binary files a/install/static/hostgroup_member.png and /dev/null differ
diff --git a/install/static/ipa.css b/install/static/ipa.css
index eb5396db0..f8b74bca9 100644
--- a/install/static/ipa.css
+++ b/install/static/ipa.css
@@ -274,6 +274,7 @@ span.main-separator{
 .entity-views li {
     display:inline;
     cursor: pointer;
+    padding: 3px;
 }
 
 .strikethrough { text-decoration: line-through; }
diff --git a/install/static/minus-disabled.png b/install/static/minus-disabled.png
deleted file mode 100644
index 3dcbd72be..000000000
Binary files a/install/static/minus-disabled.png and /dev/null differ
diff --git a/install/static/minus-enabled.png b/install/static/minus-enabled.png
deleted file mode 100644
index 5a98ebbb1..000000000
Binary files a/install/static/minus-enabled.png and /dev/null differ
diff --git a/install/static/minus-hover.png b/install/static/minus-hover.png
deleted file mode 100644
index 7875dbe1c..000000000
Binary files a/install/static/minus-hover.png and /dev/null differ
diff --git a/install/static/netgroup_details.png b/install/static/netgroup_details.png
deleted file mode 100644
index dba8cd263..000000000
Binary files a/install/static/netgroup_details.png and /dev/null differ
diff --git a/install/static/netgroup_enroll.png b/install/static/netgroup_enroll.png
deleted file mode 100644
index d8b6413f4..000000000
Binary files a/install/static/netgroup_enroll.png and /dev/null differ
diff --git a/install/static/netgroup_member.png b/install/static/netgroup_member.png
deleted file mode 100644
index 8fddc243d..000000000
Binary files a/install/static/netgroup_member.png and /dev/null differ
diff --git a/install/static/plus-disabled.png b/install/static/plus-disabled.png
deleted file mode 100644
index cb0e874f9..000000000
Binary files a/install/static/plus-disabled.png and /dev/null differ
diff --git a/install/static/plus-enabled.png b/install/static/plus-enabled.png
deleted file mode 100644
index 74882af75..000000000
Binary files a/install/static/plus-enabled.png and /dev/null differ
diff --git a/install/static/plus-hover.png b/install/static/plus-hover.png
deleted file mode 100644
index e9b2278cf..000000000
Binary files a/install/static/plus-hover.png and /dev/null differ
diff --git a/install/static/rolegroup_details.png b/install/static/rolegroup_details.png
deleted file mode 100644
index 74882af75..000000000
Binary files a/install/static/rolegroup_details.png and /dev/null differ
diff --git a/install/static/rolegroup_member.png b/install/static/rolegroup_member.png
deleted file mode 100644
index 74882af75..000000000
Binary files a/install/static/rolegroup_member.png and /dev/null differ
diff --git a/install/static/search.png b/install/static/search.png
deleted file mode 100644
index ecab81b32..000000000
Binary files a/install/static/search.png and /dev/null differ
diff --git a/install/static/service_details.png b/install/static/service_details.png
deleted file mode 100644
index 4d8542f98..000000000
Binary files a/install/static/service_details.png and /dev/null differ
diff --git a/install/static/service_enroll.png b/install/static/service_enroll.png
deleted file mode 100644
index ffc6f108e..000000000
Binary files a/install/static/service_enroll.png and /dev/null differ
diff --git a/install/static/service_member.png b/install/static/service_member.png
deleted file mode 100644
index 2368856ec..000000000
Binary files a/install/static/service_member.png and /dev/null differ
diff --git a/install/static/taskgroup_details.png b/install/static/taskgroup_details.png
deleted file mode 100644
index 74882af75..000000000
Binary files a/install/static/taskgroup_details.png and /dev/null differ
diff --git a/install/static/user_details.png b/install/static/user_details.png
deleted file mode 100644
index 0b43f8e74..000000000
Binary files a/install/static/user_details.png and /dev/null differ
diff --git a/install/static/user_enroll.png b/install/static/user_enroll.png
deleted file mode 100644
index 38d3e2d7f..000000000
Binary files a/install/static/user_enroll.png and /dev/null differ
diff --git a/install/static/user_member.png b/install/static/user_member.png
deleted file mode 100644
index ae556b022..000000000
Binary files a/install/static/user_member.png and /dev/null differ