diff --git a/freeipa.spec.in b/freeipa.spec.in
index 11729b23a..33aba87db 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -508,8 +508,6 @@ fi
 %{_usr}/share/ipa/migration/migration.py*
 %dir %{_usr}/share/ipa/ui
 %{_usr}/share/ipa/ui/index.html
-%{_usr}/share/ipa/ui/*.png
-%{_usr}/share/ipa/ui/*.gif
 %{_usr}/share/ipa/ui/*.ico
 %{_usr}/share/ipa/ui/*.css
 %{_usr}/share/ipa/ui/*.js
@@ -517,6 +515,9 @@ fi
 %{_usr}/share/ipa/ui/*.svg
 %{_usr}/share/ipa/ui/*.ttf
 %{_usr}/share/ipa/ui/*.woff
+%dir %{_usr}/share/ipa/ui/images
+%{_usr}/share/ipa/ui/images/*.png
+%{_usr}/share/ipa/ui/images/*.gif
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
@@ -615,6 +616,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Wed Oct 26 2011 Endi S. Dewata <edewata@redhat.com> - 2.99.0-10
+- Moved UI images into install/ui/images
+
 * Mon Oct 24 2011 Endi S. Dewata <edewata@redhat.com> - 2.99.0-9
 - Removed hbac-deny-remove.html
 
diff --git a/install/configure.ac b/install/configure.ac
index f5ddab791..c70eef4ad 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -75,6 +75,7 @@ AC_CONFIG_FILES([
     migration/Makefile
     share/Makefile
     ui/Makefile
+    ui/images/Makefile
     tools/Makefile
     tools/man/Makefile
     updates/Makefile
diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
index 83f6f8c10..aa978f040 100644
--- a/install/html/browserconfig.html
+++ b/install/html/browserconfig.html
@@ -24,7 +24,7 @@
     <div class="container_1">
 
         <div class="header-logo">
-            <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" />
+            <img src="../ui/images/ipa-logo.png" /><img src="../ui/images/ipa-banner.png" />
         </div>
 
         <div class="textblockkrb" style="display: none;">
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index 1df99041d..f77402aa3 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -14,11 +14,11 @@
 
   <div class="container_1 ssbrowser">
     <div class="header-logo">
-            <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" />
+            <img src="../ui/images/ipa-logo.png" /><img src="../ui/images/ipa-banner.png" />
         </div>
        <div class="textblockkrb">
         <h1>Browser Kerberos Setup</h1>
-        <img alt="Internet Explorer" src="../ui/ie-icon.png"><h2>Internet Explorer Configuration</h2>
+        <img alt="Internet Explorer" src="../ui/images/ie-icon.png"><h2>Internet Explorer Configuration</h2>
         <p>Once you are able to log into the workstation with your kerberos key you are now able to use that ticket in Internet Explorer. </p>
 
           <strong>Login to the Windows machine using an account of your Kerberos realm (administrative domain)</strong><br>
@@ -42,7 +42,7 @@
 
             <br>
 
-        <img alt="Firefox" src="../ui/firefox-icon.png"><h2>Firefox Configuration</h2>
+        <img alt="Firefox" src="../ui/images/firefox-icon.png"><h2>Firefox Configuration</h2>
 
         <p>You can configure Firefox to use Kerberos for Single Sign-on. The following instructions will guide you in configuring your web browser <br>
          to send your Kerberos credentials to the appropriate Key Distribution Center which enables Single Sign-on.  </p>
diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
index ee164f168..00d795077 100644
--- a/install/html/unauthorized.html
+++ b/install/html/unauthorized.html
@@ -26,7 +26,7 @@
     <div class="container_1">
 
         <div class="header-logo">
-            <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" />
+            <img src="../ui/images/ipa-logo.png" /><img src="../ui/images/ipa-banner.png" />
         </div>
 
         <div class="textblockkrb">
diff --git a/install/migration/error.html b/install/migration/error.html
index 521b3ee1c..85ff4c1f6 100644
--- a/install/migration/error.html
+++ b/install/migration/error.html
@@ -13,7 +13,7 @@
 
   <div class="container_1">
     <div class="header-logo">
-            <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" />
+            <img src="../ui/images/ipa-logo.png" /><img src="../ui/images/ipa-banner.png" />
         </div>
         <br>
         <br>
diff --git a/install/migration/index.html b/install/migration/index.html
index e0c7d1f50..908162b89 100644
--- a/install/migration/index.html
+++ b/install/migration/index.html
@@ -13,7 +13,7 @@
 
   <div class="container_1">
     <div class="header-logo">
-            <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" />
+            <img src="../ui/images/ipa-logo.png" /><img src="../ui/images/ipa-banner.png" />
         </div>
        <div class="textblock">
         <h1>Password Migration</h1>
diff --git a/install/migration/invalid.html b/install/migration/invalid.html
index 70e49f659..d1ba60ac4 100644
--- a/install/migration/invalid.html
+++ b/install/migration/invalid.html
@@ -13,7 +13,7 @@
 
   <div class="container_1">
     <div class="header-logo">
-            <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" />
+            <img src="../ui/images/ipa-logo.png" /><img src="../ui/images/ipa-banner.png" />
         </div>
        <div class="textblock">
         <h1>Password Migration</h1>
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index 2c97d3724..a15b070b9 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -3,61 +3,37 @@ AUTOMAKE_OPTIONS = 1.7
 NULL =
 
 SUBDIRS =  				\
+	images				\
 	$(NULL)
 
 appdir = $(IPA_DATA_DIR)/ui
 app_DATA =				\
 	aci.js				\
-	add-icon.png			\
 	add.js				\
-	arrow_collapsed.png		\
-	arrow_expanded.png		\
 	association.js			\
 	automount.js			\
-	background-center.png		\
-	background-left.png		\
-	background-right.png		\
-	caution.png			\
 	certificate.js 			\
-	centered-bg.png			\
-	check.png			\
-	combobox_open.png		\
-	consume.png			\
 	details.js 			\
 	dialog.js 			\
 	dns.js				\
 	entitle.js 			\
 	entity.js 			\
-	facet-tab_off.png		\
-	facet-tab_on.png		\
 	favicon.ico			\
-	firefox-icon.png		\
 	group.js 			\
 	hbac.js 			\
 	host.js 			\
 	hostgroup.js 			\
-	hover-tab.png 			\
-	ie-icon.png 			\
-	import.png 			\
 	index.html 			\
 	ipa.css				\
 	ipa.js				\
-	ipabanner.png			\
-	ipalogo.png			\
 	jquery-ui.css			\
 	jquery-ui.js			\
 	jquery.ba-bbq.js		\
 	jquery.js			\
 	jquery.ordered-map.js 		\
 	json2.js			\
-	Mainnav-background.png		\
-	Mainnav-offtab.png  		\
-	Mainnav-ontab.png  		\
-	modal-background.png  		\
-	nav-arrow.png			\
 	navigation.js			\
 	netgroup.js 			\
-	outer-bg.png			\
 	overpass_bold-web.eot		\
 	overpass_bold-web.svg		\
 	overpass_bold-web.ttf		\
@@ -67,38 +43,11 @@ app_DATA =				\
 	overpass_regular-web.ttf	\
 	overpass_regular-web.woff	\
 	policy.js			\
-	register.png			\
-	remove-icon.png			\
-	reset-icon.png			\
 	rule.js 			\
-	search-bg.png			\
-	search-icon.png			\
 	search.js 			\
 	serverconfig.js			\
 	service.js 			\
-	spinner_header.gif		\
-	spinner_small.gif		\
 	sudo.js				\
-	top-bg.png			\
-	panel-background.png		\
-	Static-Background.png		\
-	Subnav-background.png		\
-	ui-bg_flat_65_ffffff_40x100.png \
-	ui-bg_glass_40_111111_1x400.png \
-	ui-bg_glass_55_1c1c1c_1x400.png \
-	ui-bg_highlight-hard_100_f9f9f9_1x100.png \
-	ui-bg_highlight-hard_40_aaaaaa_1x100.png \
-	ui-bg_highlight-soft_50_aaaaaa_1x100.png \
-	ui-bg_inset-hard_45_cd0a0a_1x100.png \
-	ui-bg_inset-hard_55_ffeb80_1x100.png \
-	ui-bg_loop_8_333333_21x21.png	\
-	ui-icons_222222_256x240.png	\
-	ui-icons_4ca300_256x240.png	\
-	ui-icons_bbbbbb_256x240.png	\
-	ui-icons_ededed_256x240.png	\
-	ui-icons_ffcf29_256x240.png	\
-	ui-icons_ffffff_256x240.png	\
-	update-icon.png			\
 	user.js 			\
 	webui.js 			\
 	widget.js 			\
diff --git a/install/ui/certificate.js b/install/ui/certificate.js
index 6136edaf0..5439c4920 100755
--- a/install/ui/certificate.js
+++ b/install/ui/certificate.js
@@ -508,7 +508,7 @@ IPA.cert.status_widget = function(spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'check.png',
+            src: 'images/check-icon.png',
             style: 'float: left;',
             'class': 'status-icon'
         }).appendTo(div);
@@ -560,7 +560,7 @@ IPA.cert.status_widget = function(spec) {
             }).appendTo(container);
 
             $('<img/>', {
-                src: 'caution.png',
+                src: 'images/caution-icon.png',
                 style: 'float: left;',
                 'class': 'status-icon'
             }).appendTo(div);
@@ -600,7 +600,7 @@ IPA.cert.status_widget = function(spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'caution.png',
+            src: 'images/caution-icon.png',
             style: 'float: left;',
             'class': 'status-icon'
         }).appendTo(div);
diff --git a/install/ui/host.js b/install/ui/host.js
index 4bf41c402..992030527 100644
--- a/install/ui/host.js
+++ b/install/ui/host.js
@@ -469,7 +469,7 @@ IPA.host_keytab_widget = function(spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'caution.png',
+            src: 'images/caution-icon.png',
             'class': 'status-icon'
         }).appendTo(that.missing_span);
 
@@ -483,7 +483,7 @@ IPA.host_keytab_widget = function(spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'check.png',
+            src: 'images/check-icon.png',
             'class': 'status-icon'
         }).appendTo(that.present_span);
 
@@ -590,7 +590,7 @@ IPA.host_password_widget = function(spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'caution.png',
+            src: 'images/caution-icon.png',
             'class': 'status-icon'
         }).appendTo(that.missing_span);
 
@@ -604,7 +604,7 @@ IPA.host_password_widget = function(spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'check.png',
+            src: 'images/check-icon.png',
             'class': 'status-icon'
         }).appendTo(that.present_span);
 
diff --git a/install/ui/images/Makefile.am b/install/ui/images/Makefile.am
new file mode 100644
index 000000000..a1c2513c5
--- /dev/null
+++ b/install/ui/images/Makefile.am
@@ -0,0 +1,65 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ui/images
+app_DATA =                              \
+	add-icon.png			\
+	arrow-collapsed.png		\
+	arrow-expanded.png		\
+	background-center.png		\
+	background-left.png		\
+	background-right.png		\
+	caution-icon.png		\
+	centered-background.png		\
+	check-icon.png			\
+	combobox-open.png		\
+	entitle-consume.png		\
+	entitle-import.png 		\
+	entitle-register.png		\
+	facet-tab-off.png		\
+	facet-tab-on.png		\
+	firefox-icon.png		\
+	hover-tab.png 			\
+	ie-icon.png 			\
+	ipa-banner.png			\
+	ipa-logo.png			\
+	mainnav-background.png		\
+	mainnav-tab-off.png  		\
+	mainnav-tab-on.png  		\
+	modal-background.png  		\
+	nav-arrow.png			\
+	outer-background.png		\
+	panel-background.png		\
+	remove-icon.png			\
+	reset-icon.png			\
+	search-background.png		\
+	search-icon.png			\
+	spinner-header.gif		\
+	spinner-small.gif		\
+	static-background.png		\
+	subnav-background.png		\
+	top-background.png		\
+	ui-bg_flat_65_ffffff_40x100.png \
+	ui-bg_glass_40_111111_1x400.png \
+	ui-bg_glass_55_1c1c1c_1x400.png \
+	ui-bg_highlight-hard_100_f9f9f9_1x100.png \
+	ui-bg_highlight-hard_40_aaaaaa_1x100.png \
+	ui-bg_highlight-soft_50_aaaaaa_1x100.png \
+	ui-bg_inset-hard_45_cd0a0a_1x100.png \
+	ui-bg_inset-hard_55_ffeb80_1x100.png \
+	ui-bg_loop_8_333333_21x21.png	\
+	ui-icons_222222_256x240.png	\
+	ui-icons_4ca300_256x240.png	\
+	ui-icons_bbbbbb_256x240.png	\
+	ui-icons_ededed_256x240.png	\
+	ui-icons_ffcf29_256x240.png	\
+	ui-icons_ffffff_256x240.png	\
+	update-icon.png			\
+	$(NULL)
+
+EXTRA_DIST =                            \
+        $(app_DATA)                     \
+        $(NULL)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        Makefile.in
diff --git a/install/ui/add-icon.png b/install/ui/images/add-icon.png
similarity index 100%
rename from install/ui/add-icon.png
rename to install/ui/images/add-icon.png
diff --git a/install/ui/arrow_collapsed.png b/install/ui/images/arrow-collapsed.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/arrow_collapsed.png
rename to install/ui/images/arrow-collapsed.png
diff --git a/install/ui/arrow_expanded.png b/install/ui/images/arrow-expanded.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/arrow_expanded.png
rename to install/ui/images/arrow-expanded.png
diff --git a/install/ui/background-center.png b/install/ui/images/background-center.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/background-center.png
rename to install/ui/images/background-center.png
diff --git a/install/ui/background-left.png b/install/ui/images/background-left.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/background-left.png
rename to install/ui/images/background-left.png
diff --git a/install/ui/background-right.png b/install/ui/images/background-right.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/background-right.png
rename to install/ui/images/background-right.png
diff --git a/install/ui/caution.png b/install/ui/images/caution-icon.png
similarity index 100%
rename from install/ui/caution.png
rename to install/ui/images/caution-icon.png
diff --git a/install/ui/centered-bg.png b/install/ui/images/centered-background.png
similarity index 100%
rename from install/ui/centered-bg.png
rename to install/ui/images/centered-background.png
diff --git a/install/ui/check.png b/install/ui/images/check-icon.png
similarity index 100%
rename from install/ui/check.png
rename to install/ui/images/check-icon.png
diff --git a/install/ui/combobox_open.png b/install/ui/images/combobox-open.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/combobox_open.png
rename to install/ui/images/combobox-open.png
diff --git a/install/ui/consume.png b/install/ui/images/entitle-consume.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/consume.png
rename to install/ui/images/entitle-consume.png
diff --git a/install/ui/import.png b/install/ui/images/entitle-import.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/import.png
rename to install/ui/images/entitle-import.png
diff --git a/install/ui/register.png b/install/ui/images/entitle-register.png
old mode 100755
new mode 100644
similarity index 100%
rename from install/ui/register.png
rename to install/ui/images/entitle-register.png
diff --git a/install/ui/facet-tab_off.png b/install/ui/images/facet-tab-off.png
similarity index 100%
rename from install/ui/facet-tab_off.png
rename to install/ui/images/facet-tab-off.png
diff --git a/install/ui/facet-tab_on.png b/install/ui/images/facet-tab-on.png
similarity index 100%
rename from install/ui/facet-tab_on.png
rename to install/ui/images/facet-tab-on.png
diff --git a/install/ui/firefox-icon.png b/install/ui/images/firefox-icon.png
similarity index 100%
rename from install/ui/firefox-icon.png
rename to install/ui/images/firefox-icon.png
diff --git a/install/ui/hover-tab.png b/install/ui/images/hover-tab.png
similarity index 100%
rename from install/ui/hover-tab.png
rename to install/ui/images/hover-tab.png
diff --git a/install/ui/ie-icon.png b/install/ui/images/ie-icon.png
similarity index 100%
rename from install/ui/ie-icon.png
rename to install/ui/images/ie-icon.png
diff --git a/install/ui/ipabanner.png b/install/ui/images/ipa-banner.png
similarity index 100%
rename from install/ui/ipabanner.png
rename to install/ui/images/ipa-banner.png
diff --git a/install/ui/ipalogo.png b/install/ui/images/ipa-logo.png
similarity index 100%
rename from install/ui/ipalogo.png
rename to install/ui/images/ipa-logo.png
diff --git a/install/ui/Mainnav-background.png b/install/ui/images/mainnav-background.png
similarity index 100%
rename from install/ui/Mainnav-background.png
rename to install/ui/images/mainnav-background.png
diff --git a/install/ui/Mainnav-offtab.png b/install/ui/images/mainnav-tab-off.png
similarity index 100%
rename from install/ui/Mainnav-offtab.png
rename to install/ui/images/mainnav-tab-off.png
diff --git a/install/ui/Mainnav-ontab.png b/install/ui/images/mainnav-tab-on.png
similarity index 100%
rename from install/ui/Mainnav-ontab.png
rename to install/ui/images/mainnav-tab-on.png
diff --git a/install/ui/modal-background.png b/install/ui/images/modal-background.png
similarity index 100%
rename from install/ui/modal-background.png
rename to install/ui/images/modal-background.png
diff --git a/install/ui/nav-arrow.png b/install/ui/images/nav-arrow.png
similarity index 100%
rename from install/ui/nav-arrow.png
rename to install/ui/images/nav-arrow.png
diff --git a/install/ui/outer-bg.png b/install/ui/images/outer-background.png
similarity index 100%
rename from install/ui/outer-bg.png
rename to install/ui/images/outer-background.png
diff --git a/install/ui/panel-background.png b/install/ui/images/panel-background.png
similarity index 100%
rename from install/ui/panel-background.png
rename to install/ui/images/panel-background.png
diff --git a/install/ui/remove-icon.png b/install/ui/images/remove-icon.png
similarity index 100%
rename from install/ui/remove-icon.png
rename to install/ui/images/remove-icon.png
diff --git a/install/ui/reset-icon.png b/install/ui/images/reset-icon.png
similarity index 100%
rename from install/ui/reset-icon.png
rename to install/ui/images/reset-icon.png
diff --git a/install/ui/search-bg.png b/install/ui/images/search-background.png
similarity index 100%
rename from install/ui/search-bg.png
rename to install/ui/images/search-background.png
diff --git a/install/ui/search-icon.png b/install/ui/images/search-icon.png
similarity index 100%
rename from install/ui/search-icon.png
rename to install/ui/images/search-icon.png
diff --git a/install/ui/spinner_header.gif b/install/ui/images/spinner-header.gif
similarity index 100%
rename from install/ui/spinner_header.gif
rename to install/ui/images/spinner-header.gif
diff --git a/install/ui/spinner_small.gif b/install/ui/images/spinner-small.gif
similarity index 100%
rename from install/ui/spinner_small.gif
rename to install/ui/images/spinner-small.gif
diff --git a/install/ui/Static-Background.png b/install/ui/images/static-background.png
similarity index 100%
rename from install/ui/Static-Background.png
rename to install/ui/images/static-background.png
diff --git a/install/ui/Subnav-background.png b/install/ui/images/subnav-background.png
similarity index 100%
rename from install/ui/Subnav-background.png
rename to install/ui/images/subnav-background.png
diff --git a/install/ui/top-bg.png b/install/ui/images/top-background.png
similarity index 100%
rename from install/ui/top-bg.png
rename to install/ui/images/top-background.png
diff --git a/install/ui/ui-bg_flat_65_ffffff_40x100.png b/install/ui/images/ui-bg_flat_65_ffffff_40x100.png
similarity index 100%
rename from install/ui/ui-bg_flat_65_ffffff_40x100.png
rename to install/ui/images/ui-bg_flat_65_ffffff_40x100.png
diff --git a/install/ui/ui-bg_glass_40_111111_1x400.png b/install/ui/images/ui-bg_glass_40_111111_1x400.png
similarity index 100%
rename from install/ui/ui-bg_glass_40_111111_1x400.png
rename to install/ui/images/ui-bg_glass_40_111111_1x400.png
diff --git a/install/ui/ui-bg_glass_55_1c1c1c_1x400.png b/install/ui/images/ui-bg_glass_55_1c1c1c_1x400.png
similarity index 100%
rename from install/ui/ui-bg_glass_55_1c1c1c_1x400.png
rename to install/ui/images/ui-bg_glass_55_1c1c1c_1x400.png
diff --git a/install/ui/ui-bg_highlight-hard_100_f9f9f9_1x100.png b/install/ui/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png
similarity index 100%
rename from install/ui/ui-bg_highlight-hard_100_f9f9f9_1x100.png
rename to install/ui/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png
diff --git a/install/ui/ui-bg_highlight-hard_40_aaaaaa_1x100.png b/install/ui/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png
similarity index 100%
rename from install/ui/ui-bg_highlight-hard_40_aaaaaa_1x100.png
rename to install/ui/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png
diff --git a/install/ui/ui-bg_highlight-soft_50_aaaaaa_1x100.png b/install/ui/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png
similarity index 100%
rename from install/ui/ui-bg_highlight-soft_50_aaaaaa_1x100.png
rename to install/ui/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png
diff --git a/install/ui/ui-bg_inset-hard_45_cd0a0a_1x100.png b/install/ui/images/ui-bg_inset-hard_45_cd0a0a_1x100.png
similarity index 100%
rename from install/ui/ui-bg_inset-hard_45_cd0a0a_1x100.png
rename to install/ui/images/ui-bg_inset-hard_45_cd0a0a_1x100.png
diff --git a/install/ui/ui-bg_inset-hard_55_ffeb80_1x100.png b/install/ui/images/ui-bg_inset-hard_55_ffeb80_1x100.png
similarity index 100%
rename from install/ui/ui-bg_inset-hard_55_ffeb80_1x100.png
rename to install/ui/images/ui-bg_inset-hard_55_ffeb80_1x100.png
diff --git a/install/ui/ui-bg_loop_8_333333_21x21.png b/install/ui/images/ui-bg_loop_8_333333_21x21.png
similarity index 100%
rename from install/ui/ui-bg_loop_8_333333_21x21.png
rename to install/ui/images/ui-bg_loop_8_333333_21x21.png
diff --git a/install/ui/ui-icons_222222_256x240.png b/install/ui/images/ui-icons_222222_256x240.png
similarity index 100%
rename from install/ui/ui-icons_222222_256x240.png
rename to install/ui/images/ui-icons_222222_256x240.png
diff --git a/install/ui/ui-icons_4ca300_256x240.png b/install/ui/images/ui-icons_4ca300_256x240.png
similarity index 100%
rename from install/ui/ui-icons_4ca300_256x240.png
rename to install/ui/images/ui-icons_4ca300_256x240.png
diff --git a/install/ui/ui-icons_bbbbbb_256x240.png b/install/ui/images/ui-icons_bbbbbb_256x240.png
similarity index 100%
rename from install/ui/ui-icons_bbbbbb_256x240.png
rename to install/ui/images/ui-icons_bbbbbb_256x240.png
diff --git a/install/ui/ui-icons_ededed_256x240.png b/install/ui/images/ui-icons_ededed_256x240.png
similarity index 100%
rename from install/ui/ui-icons_ededed_256x240.png
rename to install/ui/images/ui-icons_ededed_256x240.png
diff --git a/install/ui/ui-icons_ffcf29_256x240.png b/install/ui/images/ui-icons_ffcf29_256x240.png
similarity index 100%
rename from install/ui/ui-icons_ffcf29_256x240.png
rename to install/ui/images/ui-icons_ffcf29_256x240.png
diff --git a/install/ui/ui-icons_ffffff_256x240.png b/install/ui/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from install/ui/ui-icons_ffffff_256x240.png
rename to install/ui/images/ui-icons_ffffff_256x240.png
diff --git a/install/ui/update-icon.png b/install/ui/images/update-icon.png
similarity index 100%
rename from install/ui/update-icon.png
rename to install/ui/images/update-icon.png
diff --git a/install/ui/index.html b/install/ui/index.html
index 8fa96bf72..5fc4c61ff 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -60,10 +60,10 @@
 
         <div id="header">
             <span class="header-logo">
-                 <a href="#"><img src="ipalogo.png" /><img src="ipabanner.png" /></a>
+                 <a href="#"><img src="images/ipa-logo.png" /><img src="images/ipa-banner.png" /></a>
             </span>
             <span id="header-network-activity-indicator" class="network-activity-indicator">
-                 <img src="spinner_header.gif" />
+                 <img src="images/spinner-header.gif" />
             </span>
             <span id="loggedinas" class="header-loggedinas">
                  <a href="#"><span id="login_header">Logged in as</span>: <strong>user@FREEIPA.ORG</strong></a>
diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index 86d3b9db5..d9b547575 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -39,7 +39,7 @@ html {
 
 body {
     overflow: auto;
-    background: url("outer-bg.png");
+    background: url(images/outer-background.png);
     background-repeat: repeat-x;
     background-position: left top;
     background-color: #FFFFFF;
@@ -78,7 +78,7 @@ body {
     left: 0;
     right: 0;
     height: 34px;
-    background: url("top-bg.png") #0C3B00;
+    background: url(images/top-background.png) #0C3B00;
 }
 
 #background-navigation {
@@ -87,7 +87,7 @@ body {
     left: 0;
     right: 0;
     height: 72px;
-    background: url("Mainnav-background.png");
+    background: url(images/mainnav-background.png);
 }
 
 #background-left {
@@ -96,7 +96,7 @@ body {
     left: 0;
     width: 10px;
     bottom: 0;
-    background: url("background-left.png");
+    background: url(images/background-left.png);
     background-repeat: no-repeat;
 }
 
@@ -106,7 +106,7 @@ body {
     left: 10px;
     right: 10px;
     bottom: 0;
-    background: url("background-center.png");
+    background: url(images/background-center.png);
     background-repeat: repeat-x;
 }
 
@@ -116,7 +116,7 @@ body {
     right: 0;
     width: 10px;
     bottom: 0;
-    background: url("background-right.png");
+    background: url(images/background-right.png);
     background-repeat: no-repeat;
 }
 
@@ -138,53 +138,53 @@ body {
 }
 
 .combobox-icon {
-    background: url(combobox_open.png);
+    background: url(images/combobox-open.png);
 }
 
 .expanded-icon {
-    background: url(arrow_expanded.png);
+    background: url(images/arrow-expanded.png);
 }
 
 .collapsed-icon {
-    background: url(arrow_collapsed.png);
+    background: url(images/arrow-collapsed.png);
 }
 
 .search-icon {
-    background: url(search-icon.png) no-repeat;
+    background: url(images/search-icon.png) no-repeat;
 }
 
 .add-icon {
-    background: url(add-icon.png);
+    background: url(images/add-icon.png);
     margin: -4px 0 0 1px;
 }
 
 .remove-icon {
-    background: url(remove-icon.png);
+    background: url(images/remove-icon.png);
     margin: -4px 0 0 1px;
 }
 
 .update-icon {
-    background: url(update-icon.png);
+    background: url(images/update-icon.png);
     margin: -4px 0 0 1px;
 }
 
 .reset-icon {
-    background: url(reset-icon.png);
+    background: url(images/reset-icon.png);
     margin: -4px 0 0 1px;
 }
 
 .register-icon {
-    background: url(register.png);
+    background: url(images/entitle-register.png);
     margin: -4px 0 0 1px;
 }
 
 .import-icon {
-    background: url(import.png);
+    background: url(images/entitle-import.png);
     margin: -4px 0 0 1px;
 }
 
 .consume-icon {
-    background: url(consume.png);
+    background: url(images/entitle-consume.png);
     margin: -4px 0 0 1px;
 }
 
@@ -266,7 +266,7 @@ div.tabs {
 }
 
 .tabs1 > .ui-tabs-nav > .ui-state-hover {
-    background: url("hover-tab.png");
+    background: url(images/hover-tab.png);
 }
 
 .tabs1 > .ui-tabs-nav {
@@ -280,7 +280,7 @@ div.tabs {
 .tabs1 > .ui-tabs-nav li {
     -moz-border-radius: 0 !important;
     -webkit-border-radius: 0 !important;
-    background-image: url("Mainnav-offtab.png");
+    background-image: url(images/mainnav-tab-off.png);
     margin: 0 0.4em 0 0;
     border-width: 0;
     text-align: center;
@@ -290,7 +290,7 @@ div.tabs {
 
 .tabs1 > .ui-tabs-nav > li.ui-tabs-selected {
     padding: 0 0;
-    background-image: url("Mainnav-ontab.png");
+    background-image: url(images/mainnav-tab-on.png);
     text-align: center;
 }
 
@@ -347,7 +347,7 @@ span.main-nav-off > a:visited{
 }
 
 .tabs2 > .ui-tabs-nav > li.ui-tabs-selected  {
-    background: url("nav-arrow.png") no-repeat scroll center 2.1em transparent !important;
+    background: url(images/nav-arrow.png) no-repeat scroll center 2.1em transparent !important;
     height: 3.1em;
     border: none;
     margin: 0;
@@ -552,7 +552,7 @@ span.main-nav-off > a:visited {
     text-decoration: none;
     display: inline-block;
     line-height: 19px;
-    background-image: url("facet-tab_off.png");
+    background-image: url(images/facet-tab-off.png);
     color: #666666;
 }
 
@@ -564,7 +564,7 @@ span.main-nav-off > a:visited {
     color: #6C6F73;
     background-color: #f1f0ee;
     font-weight: bold;
-    background-image: url("facet-tab_on.png");
+    background-image: url(images/facet-tab-on.png);
     height: 20px;
 }
 
@@ -639,7 +639,7 @@ span.main-nav-off > a:visited {
     -webkit-border-radius: 15px !important;
     border-radius: 15px !important;
     border: 1px solid #9f9e9e;
-    background: url("search-bg.png");
+    background: url(images/search-background.png);
     height: 20px;
     line-height: 20px;
     padding: 0 8px 0;
@@ -1011,7 +1011,7 @@ table.kerberos-key-status {
 }
 
 .status-valid {
-    background-image:url('check.png');
+    background-image: url(images/check-icon.png);
     border: 0.2em solid #008000;
 }
 
@@ -1258,7 +1258,7 @@ table.scrollable tbody {
 /* Info and simple pages (not main app) */
 
 body.info-page  {
-    background: url("Static-Background.png") repeat-x scroll left top #EDEDED;
+    background: url(images/static-background.png) repeat-x scroll left top #EDEDED;
 }
 
 .info-page h1 {
@@ -1270,7 +1270,7 @@ body.info-page  {
     margin-left: auto;
     margin-right: auto;
     width: 960px;
-    background: url("centered-bg.png") no-repeat scroll 0 7em transparent;
+    background: url(images/centered-background.png) no-repeat scroll 0 7em transparent;
     min-height: 40em;
 }
 
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index 15088f61a..0ce783dbc 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -854,7 +854,7 @@ IPA.get_member_attribute = function(obj_name, member) {
 IPA.create_network_spinner = function(){
     return $('<span />',{
         'class':'network-activity-indicator',
-        html: '<img src="spinner_small.gif" />'});
+        html: '<img src="images/spinner-small.gif" />'});
 };
 
 IPA.dirty_dialog = function(spec) {
diff --git a/install/ui/jquery-ui.css b/install/ui/jquery-ui.css
index eb0228cd2..36044dc47 100644
--- a/install/ui/jquery-ui.css
+++ b/install/ui/jquery-ui.css
@@ -59,26 +59,26 @@
 .ui-widget { font-family: Verdana, Arial, sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #cccccc; background: #f9f9f9 url(ui-bg_highlight-hard_100_f9f9f9_1x100.png) 50% top repeat-x; color: #222222; }
+.ui-widget-content { border: 1px solid #cccccc; background: #f9f9f9 url(images/ui-bg_highlight-hard_100_f9f9f9_1x100.png) 50% top repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #a3a3a3; background: #333333 url(ui-bg_loop_8_333333_21x21.png) 50% 50% repeat; color: #eeeeee; font-weight: bold; }
+.ui-widget-header { border: 1px solid #a3a3a3; background: #333333 url(images/ui-bg_loop_8_333333_21x21.png) 50% 50% repeat; color: #eeeeee; font-weight: bold; }
 .ui-widget-header a { color: #eeeeee; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #777777; background: #111111 url(ui-bg_glass_40_111111_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #e3e3e3; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #777777; background: #111111 url(images/ui-bg_glass_40_111111_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #e3e3e3; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #e3e3e3; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #000000; background: #1c1c1c url(ui-bg_glass_55_1c1c1c_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #000000; background: #1c1c1c url(images/ui-bg_glass_55_1c1c1c_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #ffffff url(ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #222222; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #ffffff url(images/ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #222222; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #222222; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #ffde2e; background: #ffeb80 url(ui-bg_inset-hard_55_ffeb80_1x100.png) 50% bottom repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #ffde2e; background: #ffeb80 url(images/ui-bg_inset-hard_55_ffeb80_1x100.png) 50% bottom repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #9e0505; background: #cd0a0a url(ui-bg_inset-hard_45_cd0a0a_1x100.png) 50% bottom repeat-x; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #9e0505; background: #cd0a0a url(images/ui-bg_inset-hard_45_cd0a0a_1x100.png) 50% bottom repeat-x; color: #ffffff; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -89,14 +89,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(ui-icons_bbbbbb_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(ui-icons_ededed_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(ui-icons_4ca300_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_ffcf29_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_bbbbbb_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_ededed_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_4ca300_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffcf29_256x240.png); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -291,8 +291,8 @@
 .ui-corner-all { -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(ui-bg_highlight-hard_40_aaaaaa_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(ui-bg_highlight-soft_50_aaaaaa_1x100.png) 50% top repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_highlight-hard_40_aaaaaa_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_highlight-soft_50_aaaaaa_1x100.png) 50% top repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
  * jQuery UI Resizable @VERSION
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
diff --git a/install/ui/service.js b/install/ui/service.js
index 43e1516ad..0dcfea357 100644
--- a/install/ui/service.js
+++ b/install/ui/service.js
@@ -208,7 +208,7 @@ IPA.service_provisioning_status_widget = function (spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'check.png',
+            src: 'images/check-icon.png',
             style: 'float: left;',
             'class': 'status-icon'
         }).appendTo(div);
@@ -233,7 +233,7 @@ IPA.service_provisioning_status_widget = function (spec) {
         }).appendTo(container);
 
         $('<img/>', {
-            src: 'caution.png',
+            src: 'images/caution-icon.png',
             style: 'float: left;',
             'class': 'status-icon'
         }).appendTo(div);