diff --git a/demos/autocomplete/custom-data.html b/demos/autocomplete/custom-data.html
index 139b41d99..b9de20576 100644
--- a/demos/autocomplete/custom-data.html
+++ b/demos/autocomplete/custom-data.html
@@ -60,7 +60,7 @@
 				$('#project').val(ui.item.label);
 				$('#project-id').val(ui.item.value);
 				$('#project-description').html(ui.item.desc);
-				$('#project-icon').attr('src', '../images/' + ui.item.icon);
+				$('#project-icon').attr('src', 'images/' + ui.item.icon);
 				
 				return false;
 			}
@@ -78,7 +78,7 @@
 
 <div class="demo">
 	<div id="project-label">Select a project (type "j" for a start):</div>
-	<img id="project-icon" src="../images/transparent_1x1.png" class="ui-state-default"/>
+	<img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default"/>
 	<input id="project"/>
 	<input type="hidden" id="project-id"/>
 	<p id="project-description"></p>
diff --git a/demos/images/jquery_32x32.png b/demos/autocomplete/images/jquery_32x32.png
similarity index 100%
rename from demos/images/jquery_32x32.png
rename to demos/autocomplete/images/jquery_32x32.png
diff --git a/demos/images/jqueryui_32x32.png b/demos/autocomplete/images/jqueryui_32x32.png
similarity index 100%
rename from demos/images/jqueryui_32x32.png
rename to demos/autocomplete/images/jqueryui_32x32.png
diff --git a/demos/images/sizzlejs_32x32.png b/demos/autocomplete/images/sizzlejs_32x32.png
similarity index 100%
rename from demos/images/sizzlejs_32x32.png
rename to demos/autocomplete/images/sizzlejs_32x32.png
diff --git a/demos/images/transparent_1x1.png b/demos/autocomplete/images/transparent_1x1.png
similarity index 100%
rename from demos/images/transparent_1x1.png
rename to demos/autocomplete/images/transparent_1x1.png
diff --git a/themes/base/images/ui-anim_basic_16x16.gif b/demos/autocomplete/images/ui-anim_basic_16x16.gif
similarity index 100%
rename from themes/base/images/ui-anim_basic_16x16.gif
rename to demos/autocomplete/images/ui-anim_basic_16x16.gif
diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html
index 88284aa0d..520505159 100644
--- a/demos/autocomplete/multiple-remote.html
+++ b/demos/autocomplete/multiple-remote.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
-	.ui-autocomplete-loading { background: white url('../../themes/base/images/ui-anim_basic_16x16.gif') right center no-repeat; }
+	.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
 	</style>
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/autocomplete/remote-jsonp.html b/demos/autocomplete/remote-jsonp.html
index ccb70906d..127298e36 100644
--- a/demos/autocomplete/remote-jsonp.html
+++ b/demos/autocomplete/remote-jsonp.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
-	.ui-autocomplete-loading { background: white url('../../themes/base/images/ui-anim_basic_16x16.gif') right center no-repeat; }
+	.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
 	</style>
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/autocomplete/remote-with-cache.html b/demos/autocomplete/remote-with-cache.html
index 4c9711a84..bd261f44e 100644
--- a/demos/autocomplete/remote-with-cache.html
+++ b/demos/autocomplete/remote-with-cache.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
-	.ui-autocomplete-loading { background: white url('../../themes/base/images/ui-anim_basic_16x16.gif') right center no-repeat; }
+	.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
 	</style>
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/autocomplete/remote.html b/demos/autocomplete/remote.html
index 16f817678..2dd0eb733 100644
--- a/demos/autocomplete/remote.html
+++ b/demos/autocomplete/remote.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
-	.ui-autocomplete-loading { background: white url('../../themes/base/images/ui-anim_basic_16x16.gif') right center no-repeat; }
+	.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
 	</style>
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/autocomplete/xml.html b/demos/autocomplete/xml.html
index b3c15c71e..c00868cac 100644
--- a/demos/autocomplete/xml.html
+++ b/demos/autocomplete/xml.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
-	.ui-autocomplete-loading { background: white url('../../themes/base/images/ui-anim_basic_16x16.gif') right center no-repeat; }
+	.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
 	</style>
 	<script type="text/javascript">
 	$(function() {