Moving relevant images off of amo2009 (bug 628412)

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "media/img/amo2009"]
-	path = media/img/amo2009
-	url = git://github.com/jbalogh/amo2009-img.git
 [submodule "lib/product_details/json"]
 	path = lib/product_details/json
 	url = git://github.com/jbalogh/mozilla-product-details.git

apps/addons/models.py

@@ -612,7 +612,7 @@ class Addon(amo.models.OnChangeMixin, amo.models.ModelBase):
             preview = self.all_previews[0]
             return preview.thumbnail_url
         except IndexError:
-            return settings.MEDIA_URL + '/img/amo2009/icons/no-preview.png'
+            return settings.MEDIA_URL + '/img/icons/no-preview.png'
 
     def can_request_review(self):
         """Return the statuses an add-on can request."""

apps/addons/templates/addons/collections_teaser.html

@@ -15,7 +15,7 @@
         <h2>{{ _('What are Add-ons?') }}</h2>
         <div class="column-wrapper">
           <div class="first column">
-            <h3><img src="{{ media('img/amo2009/illustrations/extras.gif') }}"
+            <h3><img src="{{ media('img/illustrations/extras.gif') }}"
                      alt="{{ _('Extras') }}">
             </h3>
             <p>
@@ -26,7 +26,7 @@
             </p>
           </div>
           <div class="column">
-            <h3><img src="{{ media('img/amo2009/illustrations/themes.gif') }}"
+            <h3><img src="{{ media('img/illustrations/themes.gif') }}"
                      alt="{{ _('Themes') }}">
             </h3>
             <p>
@@ -37,7 +37,7 @@
             </p>
           </div>
           <div class="column">
-            <h3><img src="{{ media('img/amo2009/illustrations/install.gif') }}"
+            <h3><img src="{{ media('img/illustrations/install.gif') }}"
                      alt="{{ _('Install') }}">
             </h3>
             <p>

apps/addons/templates/addons/home.html

@@ -96,7 +96,7 @@
 
 <div class="secondary collections-sidebar">
   <img alt="" width="100" height="125"
-       src="{{ media('img/amo2009/illustrations/logo-collections-100x125.png') }}">
+       src="{{ media('img/illustrations/logo-collections-100x125.png') }}">
    <h3><a href="{{ url('collections.list') }}">{{ _('Collections', 'addons_home_collections') }}</a></h3>
    <p>
      {% trans %}

apps/applications/templates/applications/appversions.html

@@ -18,7 +18,7 @@ allowed for these applications.
 {% for app in apps %}
 <div class="appversion prose">
   <h3>
-    <img src="{{ media('img/amo2009/app-icons/small/' +  app.short + '.png') }}">
+    <img src="{{ media('img/app-icons/small/' +  app.short + '.png') }}">
     {{ app.pretty }}
   </h3>
   <ul>

apps/bandwagon/models.py

@@ -249,9 +249,9 @@ class Collection(CollectionBase, amo.models.ModelBase):
         if self.icontype:
             return settings.COLLECTION_ICON_URL % (self.id, modified)
         elif self.type == amo.COLLECTION_FAVORITES:
-            return settings.MEDIA_URL + 'img/amo2009/icons/heart.png'
+            return settings.MEDIA_URL + 'img/icons/heart.png'
         else:
-            return settings.MEDIA_URL + 'img/amo2009/icons/collection.png'
+            return settings.MEDIA_URL + 'img/icons/collection.png'
 
     def get_recommendations(self):
         """Get a collection of recommended add-ons for this collection."""

apps/bandwagon/templates/bandwagon/collection_listing.html

@@ -56,7 +56,7 @@
 
   <div>
     <h3>{{ _('Add-on Collector') }}</h3>
-    <p>{% trans app=request.APP.pretty, src=media('img/amo2009/illustrations/logo-collections-download-146x159.png') %}
+    <p>{% trans app=request.APP.pretty, src=media('img/illustrations/logo-collections-download-146x159.png') %}
       <img id="addon-collector-logo" src="{{ src }}"
            width="146" height="159">
       Get updates on followed collections or manage your own collections directly

apps/bandwagon/tests/test_models.py

@@ -40,10 +40,10 @@ class TestCollections(test_utils.TestCase):
 
         # Has no icon
         c = Collection.objects.get(pk=512)
-        assert c.icon_url.endswith('img/amo2009/icons/collection.png')
+        assert c.icon_url.endswith('img/icons/collection.png')
 
         c.type = amo.COLLECTION_FAVORITES
-        assert c.icon_url.endswith('img/amo2009/icons/heart.png')
+        assert c.icon_url.endswith('img/icons/heart.png')
 
     def test_is_subscribed(self):
         c = Collection.objects.get(pk=512)

apps/bandwagon/tests/test_tasks.py

@@ -11,7 +11,7 @@ from bandwagon.tasks import resize_icon
 
 
 def test_resize_icon():
-    somepic = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+    somepic = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
 
     src = tempfile.NamedTemporaryFile(mode='r+w+b', suffix=".png",
                                       delete=False)
@@ -33,7 +33,7 @@ def test_resize_icon():
 
 def test_resize_icon_poorly():
     """If we attempt to set the src/dst, we do nothing."""
-    somepic = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+    somepic = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
     src = tempfile.NamedTemporaryFile(mode='r+w+b', suffix=".png",
                                       delete=False)
     shutil.copyfile(somepic, src.name)

apps/devhub/templates/devhub/base.html

@@ -105,7 +105,7 @@
 {% endblock %}
 
 {% block footer_extras %}
-  <img class="footerlogo" src="{{ media('img/amo2009/developers/hub-logo-footer.png') }}" alt="">
+  <img class="footerlogo" src="{{ media('img/developers/hub-logo-footer.png') }}" alt="">
 {% endblock %}
 
 {% block outer_content %}{% include "messages.html" %}{% endblock %}

apps/devhub/tests/test_tasks.py

@@ -51,7 +51,7 @@ def test_resize_icon_list():
 
 
 def _uploader(resize_size, final_size):
-    img = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+    img = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
     original_size = (82, 31)
 
     src = tempfile.NamedTemporaryFile(mode='r+w+b', suffix=".png",

apps/devhub/tests/test_views.py

@@ -1207,7 +1207,7 @@ class TestEdit(test_utils.TestCase):
             eq_(unicode(getattr(addon, k)), data[k])
 
     def test_edit_media_uploadedicon(self):
-        img = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+        img = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
         src_image = open(img, 'rb')
 
         data = dict(upload_image=src_image)
@@ -1247,7 +1247,7 @@ class TestEdit(test_utils.TestCase):
         eq_(log[0].action, amo.LOG.CHANGE_ICON.id)
 
     def test_edit_media_uploadedicon_noresize(self):
-        img = "%s/img/amo2009/notifications/error.png" % settings.MEDIA_ROOT
+        img = "%s/img/notifications/error.png" % settings.MEDIA_ROOT
         src_image = open(img, 'rb')
 
         data = dict(upload_image=src_image)
@@ -1363,7 +1363,7 @@ class TestEdit(test_utils.TestCase):
         eq_(response_json['errors'][0], u'Icons cannot be animated.')
 
     def preview_add(self, amount=1):
-        img = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+        img = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
         src_image = open(img, 'rb')
 
         data = dict(upload_image=src_image)
@@ -2032,7 +2032,7 @@ class TestSubmitStep4(TestSubmitBase):
             eq_(unicode(getattr(addon, k)), data[k])
 
     def test_edit_media_uploadedicon(self):
-        img = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+        img = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
         src_image = open(img, 'rb')
 
         data = dict(upload_image=src_image)
@@ -2065,7 +2065,7 @@ class TestSubmitStep4(TestSubmitBase):
         eq_(Image.open(dest).size, (32, 12))
 
     def test_edit_media_uploadedicon_noresize(self):
-        img = "%s/img/amo2009/notifications/error.png" % settings.MEDIA_ROOT
+        img = "%s/img/notifications/error.png" % settings.MEDIA_ROOT
         src_image = open(img, 'rb')
 
         data = dict(upload_image=src_image)

apps/users/tests/test_tasks.py

@@ -22,7 +22,7 @@ def test_delete_photo():
 
 
 def test_resize_photo():
-    somepic = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+    somepic = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
 
     src = tempfile.NamedTemporaryFile(mode='r+w+b', suffix=".png",
                                       delete=False)
@@ -45,7 +45,7 @@ def test_resize_photo():
 
 def test_resize_photo_poorly():
     """If we attempt to set the src/dst, we do nothing."""
-    somepic = "%s/img/amo2009/tab-mozilla.png" % settings.MEDIA_ROOT
+    somepic = "%s/img/tab-mozilla.png" % settings.MEDIA_ROOT
     src = tempfile.NamedTemporaryFile(mode='r+w+b', suffix=".png",
                                       delete=False)
     shutil.copyfile(somepic, src.name)

media/css/legacy/ie.css

@@ -78,6 +78,6 @@ form fieldset .container {
 }
 
 .collections-landing {
-    background-image: url(../../img/amo2009/illustrations/logo-collections-220x270.png);
+    background-image: url(../../img/illustrations/logo-collections-220x270.png);
     background-position: 95% 30px;
 }

media/css/legacy/main-mozilla.css

@@ -819,11 +819,11 @@ table caption {
     padding-left: 20px;
 }
 #version-history .oldversion ul.legal li.license {
-    background: url(../../img/amo2009/icons/script_code_red.png) left no-repeat;
+    background: url(../../img/icons/script_code_red.png) left no-repeat;
 }
 #version-history .oldversion ul.legal li.source,
 .version a.source-code {
-    background: url(../../img/amo2009/icons/page_code.png) left no-repeat;
+    background: url(../../img/icons/page_code.png) left no-repeat;
 }
 
 /* addons "source license" page */
@@ -1496,7 +1496,7 @@ html[xmlns] .clearfix {
 /** tag styles **/
 .addon-tags .tag .tagitem {
     padding-left: 20px;
-    background-image: url(../../img/amo2009/icons/icons.png);
+    background-image: url(../../img/icons/icons.png);
     background-repeat: no-repeat;
     background-position: 0px -1400px;
 }
@@ -1511,7 +1511,7 @@ html[xmlns] .clearfix {
 .collection-add > span,
 #addons-edit p strong {
 	padding-left: 22px;
-	background-image: url(../../img/amo2009/icons/icons.png);
+	background-image: url(../../img/icons/icons.png);
 	background-repeat: no-repeat;
 	background-position: 0px -300px;
 }
@@ -1524,7 +1524,7 @@ html[xmlns] .clearfix {
 
 .addon-otheraddons li .addonitem {
 	padding-left: 20px;
-	background-image: url(../../img/amo2009/icons/icons.png);
+	background-image: url(../../img/icons/icons.png);
 	background-repeat: no-repeat;
 	background-position: 0px -200px;
 }
@@ -1565,13 +1565,13 @@ html[xmlns] .clearfix {
     -moz-border-radius: 3px;
     border-radius: 3px;
     font-weight: bold;
-    background-image: url(../../img/amo2009/icons/arrows.gif);
+    background-image: url(../../img/icons/arrows.gif);
     background-repeat: no-repeat;
     background-position:4px -152px;
 }
 .secondary ul.refinements li a.tagitem {
     padding: 0.21em 2em;
-    background-image: url(../../img/amo2009/icons/icons.png);
+    background-image: url(../../img/icons/icons.png);
     background-repeat: no-repeat;
     background-position: 3px -596px;
 }
@@ -1811,7 +1811,7 @@ html[xmlns] .clearfix {
     color: #00b960;
     padding-left: 1.2em; /* Space for the image. */
     margin-right: 0.2em; /* Space between number and bar. */
-    background-image: url('../../img/amo2009/icons/thumbs.png');
+    background-image: url('../../img/icons/thumbs.png');
     background-position: left 33.2%;
 }
 
@@ -1823,7 +1823,7 @@ html[xmlns] .clearfix {
 
 .barometer .upvotes.voted,
 .barometer .upvotes:hover {
-    background-image: url('../../img/amo2009/icons/thumbs.png');
+    background-image: url('../../img/icons/thumbs.png');
     background-position: left 0;
 }
 
@@ -1836,7 +1836,7 @@ html[xmlns] .clearfix {
     color: #d93a40;
     padding-right: 1.2em; /* Space for the image. */
     margin-left: 0.2em; /* Space between number and bar. */
-    background-image: url('../../img/amo2009/icons/thumbs.png');
+    background-image: url('../../img/icons/thumbs.png');
     background-position: right 100%;
 }
 
@@ -1848,7 +1848,7 @@ html[xmlns] .clearfix {
 
 .barometer .downvotes.voted,
 .barometer .downvotes:hover {
-    background-image: url('../../img/amo2009/icons/thumbs.png');
+    background-image: url('../../img/icons/thumbs.png');
     background-position: right 67%;
 }
 
@@ -2001,7 +2001,7 @@ html[xmlns] .clearfix {
     text-indent: -999em;
     width: 9px;
     height: 9px;
-    background: url('../../img/amo2009/personas/slideshow-nav.png') 0 0 no-repeat;
+    background: url('../../img/personas/slideshow-nav.png') 0 0 no-repeat;
     margin: 0 3px;
     display: block;
     float: left;
@@ -2012,7 +2012,7 @@ html[xmlns] .clearfix {
 }
 
 .personas-feature .slideshow-nav li a.active {
-    background: url('../../img/amo2009/personas/slideshow-nav.png') -16px 0 no-repeat;
+    background: url('../../img/personas/slideshow-nav.png') -16px 0 no-repeat;
 }
 
 .personas-feature .slides {

media/css/legacy/main.css

@@ -419,7 +419,7 @@ button.link {
 
 .stars {
     text-indent:-5000px;
-    background-image: url(../../img/amo2009/icons/stars.png);
+    background-image: url(../../img/icons/stars.png);
     background-position: 0 50%;
     background-repeat: no-repeat;
     margin-right: 0.5em;
@@ -468,7 +468,7 @@ button.link {
 .twitter,
 .share-networks .email,
 .share-email .emailerror p {
-    background-image: url(../../img/amo2009/icons/icons.png);
+    background-image: url(../../img/icons/icons.png);
     background-repeat: no-repeat;
     padding-left: 20px;
 }
@@ -567,7 +567,7 @@ h3 .secondary a:link, h3 .secondary a:active, h3 .secondary a:visited, h3 .secon
 .more-info:active {
     font-weight: bold;
     float: right;
-    background-image: url(../../img/amo2009/icons/arrows.gif);
+    background-image: url(../../img/icons/arrows.gif);
     background-repeat: no-repeat;
     background-position:right -153px;
     padding-right: 1em;
@@ -678,7 +678,7 @@ button.disabled,
 button:disabled,
 input[type=submit].disabled,
 input[type=submit]:disabled {
-  background-image: url(../../img/amo2009/bg/button-gray.jpg);
+  background-image: url(../../img/bg/button-gray.jpg);
   background-color: #ccc;
   border-color: #aaa;
   text-shadow:-1px -1px 1px #999;
@@ -759,7 +759,7 @@ a:focus.button.neutral,
 a:active.button.neutral,
 button.neutral {
     background-color:#E5A365;
-    background-image: url(../../img/amo2009/bg/button-orange.jpg);
+    background-image: url(../../img/bg/button-orange.jpg);
     border:1px solid #CB7E42;
     text-shadow:-1px -1px 1px #BF6524;
 }
@@ -780,7 +780,7 @@ a:focus.button.positive,
 a:active.button.positive,
 button.positive {
     background-color:#8CC553;
-    background-image: url(../../img/amo2009/bg/button-green.jpg);
+    background-image: url(../../img/bg/button-green.jpg);
     border: 1px solid #488F03;
     text-shadow:-1px -1px 1px #7BAB29;
 }
@@ -801,7 +801,7 @@ a:focus.negative,
 a:active.negative,
 button.negative {
     background-color:#EC7F82;
-    background-image: url(../../img/amo2009/bg/button-red.jpg);
+    background-image: url(../../img/bg/button-red.jpg);
     border: 1px solid #CF2F1E;
     text-shadow: -1px -1px 1px #CF2F1E;
 }
@@ -822,7 +822,7 @@ a:focus.button.cool,
 a:active.button.cool,
 button.cool {
     background-color: #8D96A7;
-    background-image: url(../../img/amo2009/bg/button-dark-blue.jpg);
+    background-image: url(../../img/bg/button-dark-blue.jpg);
     border: 1px solid #22334f;
     text-shadow:-1px -1px 1px #7C869A;
 }
@@ -855,7 +855,7 @@ button.add-to-fav {
     margin: 0;
     padding: 0.5em 0 0.2em 19px;
     background: none;
-    background-image: url(../../img/amo2009/icons/fav-off.gif);
+    background-image: url(../../img/icons/fav-off.gif);
     background-position: left center;
     background-repeat: no-repeat;
     -moz-border-radius: 0;
@@ -870,7 +870,7 @@ button.add-to-fav {
 
 button.add-to-fav.fav {
     color: #CC0000;
-    background-image: url(../../img/amo2009/icons/fav-on.gif);
+    background-image: url(../../img/icons/fav-on.gif);
 }
 
 form button.add-to-fav:hover,
@@ -883,11 +883,11 @@ form button.add-to-fav.loading-fav:hover,
 form button.add-to-fav.loading-fav:focus,
 form button.add-to-fav.loading-fav:active {
     color: #A4A5A5;
-    background-image: url(../../img/amo2009/icons/orange-loading.gif);
+    background-image: url(../../img/icons/orange-loading.gif);
 }
 
 /*.favorite {
-    background-image: url(../../img/amo2009/icons/icons.png);
+    background-image: url(../../img/icons/icons.png);
     background-repeat: no-repeat;
     background-position: 0 -700px;
     padding-left: 20px;
@@ -895,12 +895,12 @@ form button.add-to-fav.loading-fav:active {
     cursor: pointer;
 }
 .favorite-loading {
-    background-image: url(../../img/amo2009/icons/orange-loading.gif);
+    background-image: url(../../img/icons/orange-loading.gif);
     background-position: 0 0;
 }
 
 .favorite-added {
-    background-image: url(../../img/amo2009/icons/icons.png);
+    background-image: url(../../img/icons/icons.png);
     background-position: 0 -800px;
     color: #D11F1F;
 } */
@@ -1012,7 +1012,7 @@ form.favorite {
 #brand a:hover,
 #brand a:focus,
 #brand a:active {
-    background-image: url(../../img/amo2009/tab-mozilla.png);
+    background-image: url(../../img/tab-mozilla.png);
     background-position: top left;
     background-repeat: no-repeat;
     width: 90px;
@@ -1135,7 +1135,7 @@ form.favorite {
 #aux-nav > ul a.controller:active {
     display: block;
     padding: 0.5em 20px 0.5em 1em;
-    background: url(../../img/amo2009/icons/arrows.gif) no-repeat;
+    background: url(../../img/icons/arrows.gif) no-repeat;
     background-position: 95% -65px;
 }
 
@@ -1523,7 +1523,7 @@ form.favorite {
     font-size: 1em;
     clear:both;
     width: 24.3%;
-    background-image: url(../../img/amo2009/icons/pointer.gif);
+    background-image: url(../../img/icons/pointer.gif);
     background-repeat: no-repeat;
     background-position: 95% 4px;
     padding-top: 10px;
@@ -1682,7 +1682,7 @@ form.favorite {
 /* @group Teaser Header */
 
 .section-teaser .teaser-header {
-    background: url(../../img/amo2009/bg/listing-footer.gif) repeat-x top left #fff;
+    background: url(../../img/bg/listing-footer.gif) repeat-x top left #fff;
     -webkit-border-bottom-right-radius: 3px;
     -webkit-border-bottom-left-radius: 3px;
     -moz-border-radius: 0 0 3px 3px;
@@ -1735,7 +1735,7 @@ form.favorite {
 }
 
 .section-teaser .teaser-header li.selected {
-    background-image: url(../../img/amo2009/bg/panel-selected.png);
+    background-image: url(../../img/bg/panel-selected.png);
     background-repeat: no-repeat;
     background-position: center top;
 }
@@ -1784,7 +1784,7 @@ form.favorite {
     left: 8px;
     width: 27px;
     height: 27px;
-    background-image: url(../../img/amo2009/icons/arrows-scroller.png);
+    background-image: url(../../img/icons/arrows-scroller.png);
     background-position: 0 0;
     background-repeat: no-repeat;
 }
@@ -1951,7 +1951,7 @@ h4.step {
     position: absolute;
     left: 0;
     top: 0;
-    background-image: url(../../img/amo2009/icons/step.png);
+    background-image: url(../../img/icons/step.png);
     background-repeat: no-repeat;
     background-position: left top;
     color: #FFFFFF;
@@ -1988,7 +1988,7 @@ ol.pagination span {
 }
 ol.pagination a[rel~="prev"],
 ol.pagination span.prev  {
-    background-image: url(../../img/amo2009/icons/arrows.gif);
+    background-image: url(../../img/icons/arrows.gif);
     background-repeat: no-repeat;
     background-position: 5px -420px;
     color: #3d6db5;
@@ -1997,7 +1997,7 @@ ol.pagination span.prev  {
 }
 ol.pagination a[rel~="next"],
 ol.pagination span.next {
-    background-image: url(../../img/amo2009/icons/arrows.gif);
+    background-image: url(../../img/icons/arrows.gif);
     background-repeat: no-repeat;
     background-position: 95% -340px;
     color: #3d6db5;
@@ -2043,7 +2043,7 @@ ol.pagination li a:active {
 }
 
 .share-arrow {
-    background-image: url(../../img/amo2009/icons/pointer.gif) no-repeat 30px top;
+    background-image: url(../../img/icons/pointer.gif) no-repeat 30px top;
     padding-top: 7px;
     display: none;
 }
@@ -2073,7 +2073,7 @@ ol.pagination li a:active {
 }
 
 .share-networks li:hover span.share-link {
-    background-image:url(../../img/amo2009/icons/share-arrow-sprite.png);
+    background-image:url(../../img/icons/share-arrow-sprite.png);
     background-repeat:no-repeat;
     background-position: right 8px;
 }
@@ -2258,7 +2258,7 @@ ol.breadcrumbs {
 
 ol.breadcrumbs li {
     display: inline;
-    background-image: url(../../img/amo2009/icons/buttons/breadcrumb.gif);
+    background-image: url(../../img/icons/buttons/breadcrumb.gif);
     background-repeat: no-repeat;
     background-position: top right;
     padding-right: 1em;
@@ -2736,7 +2736,7 @@ ol.pagination + .num-results {
 
 .listing .recommended,
 .separated-listing .recommended {
-    background-image: url(../../img/amo2009/bg/listing-item-yellow.png);
+    background-image: url(../../img/bg/listing-item-yellow.png);
     border-color: #fc9;
 }
 .recommended .meta {
@@ -2745,7 +2745,7 @@ ol.pagination + .num-results {
 
 .listing .experimental,
 .separated-listing .experimental {
-    background-image: url(../../img/amo2009/bg/listing-item-red.png);
+    background-image: url(../../img/bg/listing-item-red.png);
     border-color: #fcc;
 }
 .experimental .meta {
@@ -2811,7 +2811,7 @@ ol.pagination + .num-results {
     position: absolute;
     top: 1em;
     right:0;
-    background-image:url(../../img/amo2009/icons/developer.png);
+    background-image:url(../../img/icons/developer.png);
     background-position: left center;
     background-repeat: no-repeat;
     padding: 0.3em 1.18em 0.3em 35px;

media/css/zamboni/developers.css

@@ -1336,7 +1336,7 @@ a.extra {
 }
 #navbar li.top:hover,
 #navbar li.top.selected {
-    background-image: url(../../img/amo2009/bg/heading-dark-blue-highlighted.png);
+    background-image: url(../../img/bg/heading-dark-blue-highlighted.png);
 }
 #navbar li.top ul {
     display: none;
@@ -1358,7 +1358,7 @@ a.extra {
     display: block;
 }
 #navbar li ul li {
-    background-image: url(../../img/amo2009/bg/heading-dark-blue-highlighted.png);
+    background-image: url(../../img/bg/heading-dark-blue-highlighted.png);
     background-repeat: repeat-x;
     background-position: bottom left;
     background-color: #305083;

media/css/zamboni/discovery-pane.css

@@ -1311,7 +1311,7 @@ p.users {
 /* @Star ratings *********/
 .stars {
     text-indent: -999em;
-    background: url(../../img/amo2009/icons/stars.png) 0 50% no-repeat;
+    background: url(../../img/icons/stars.png) 0 50% no-repeat;
     margin-right: .5em;
     width: 65px;
     float: left;

media/css/zamboni/mobile.css

@@ -1227,7 +1227,7 @@ td .versions li a {
 
 .stars {
     text-indent:-5000px;
-    background-image: url(../../img/amo2009/icons/stars.png);
+    background-image: url(../../img/icons/stars.png);
     background-position: 0 50%;
     background-repeat: no-repeat;
     margin-right: 0.5em;

media/css/zamboni/zamboni.css

@@ -91,7 +91,7 @@ ul.errorlist {
 
 .other-author-addons li .addonitem {
     padding-left: 20px;
-    background-image: url(../../img/amo2009/icons/icons.png);
+    background-image: url(../../img/icons/icons.png);
     background-repeat: no-repeat;
     background-position: 0px -200px;
 }
@@ -752,11 +752,11 @@ div.popup-shim {
 }
 
 .mobile .install-note .msg, .mobile.app,
-.firefox .install-note .msg, .firefox.app { background-image: url(../../img/amo2009/app-icons/small/firefox.png); }
-.thunderbird .install-note .msg, .thunderbird.app { background-image: url(../../img/amo2009/app-icons/small/thunderbird.png); }
-.sunbird .install-note .msg, .sunbird.app { background-image: url(../../img/amo2009/app-icons/small/sunbird.png); }
-.seamonkey .install-note .msg, .seamonkey.app { background-image: url(../../img/amo2009/app-icons/small/seamonkey.png); }
-.mz.app { background-image: url(../../img/amo2009/app-icons/small/mozilla.png); }
+.firefox .install-note .msg, .firefox.app { background-image: url(../../img/app-icons/small/firefox.png); }
+.thunderbird .install-note .msg, .thunderbird.app { background-image: url(../../img/app-icons/small/thunderbird.png); }
+.sunbird .install-note .msg, .sunbird.app { background-image: url(../../img/app-icons/small/sunbird.png); }
+.seamonkey .install-note .msg, .seamonkey.app { background-image: url(../../img/app-icons/small/seamonkey.png); }
+.mz.app { background-image: url(../../img/app-icons/small/mozilla.png); }
 
 .install-note .msg.m-unreviewed,
 .install-note .msg.m-selfhosted,
@@ -1437,7 +1437,7 @@ form .error .note.error {
 }
 
 .object-content .editprofile a {
-    background: transparent url("../../img/amo2009/icons/news-feed-sprite.png") 0 -538px no-repeat;
+    background: transparent url("../../img/icons/news-feed-sprite.png") 0 -538px no-repeat;
     font-weight: bold;
     font-size: .923em;
     margin-right: 1em;
@@ -2290,7 +2290,7 @@ form .error .note.error {
 }
 
 #perf-results p#perf-more a {
-    background: url(../../img/amo2009/icons/arrows.gif) 100% -73px no-repeat;
+    background: url(../../img/icons/arrows.gif) 100% -73px no-repeat;
     padding-right: 15px;
 }
 
@@ -3413,7 +3413,7 @@ td.input {
 .collections-landing {
     padding: 1em;
     min-height: 190px;
-    background-image: url(../../img/amo2009/illustrations/logo-collections-220x270.png),
+    background-image: url(../../img/illustrations/logo-collections-220x270.png),
                       -moz-linear-gradient(#e4f5fb, #ffffff);
     background-repeat: no-repeat;
     background-position: 95% 30px, left top;

media/img/amo2009

@@ -1 +0,0 @@
-Subproject commit 18205650b1995ebc2188ceb853d220c09a75b9a8

media/js/zamboni/collections.js

@@ -349,16 +349,16 @@ $(document).ready(function() {
 $(document).ready(function(){
     var c = collections;
 
-    c.adding_img = '/img/amo2009/icons/white-loading-16x16.gif';
+    c.adding_img = '/img/icons/white-loading-16x16.gif';
     c.adding_text = gettext('Adding to Favorites…');
 
-    c.removing_img = '/img/amo2009/icons/white-loading-16x16.gif';
+    c.removing_img = '/img/icons/white-loading-16x16.gif';
     c.removing_text = gettext('Removing Favorite…');
 
-    c.add_img = '/img/amo2009/icons/buttons/plus-orange-16x16.gif';
+    c.add_img = '/img/icons/buttons/plus-orange-16x16.gif';
     c.add_text = gettext('Add to Favorites');
 
-    c.remove_img = '/img/amo2009/icons/buttons/minus-orange-16x16.gif';
+    c.remove_img = '/img/icons/buttons/minus-orange-16x16.gif';
     c.remove_text = gettext('Remove from Favorites');
 
     c.cookie_path = '/';

settings.py

@@ -538,7 +538,7 @@ PREVIEW_FULL_PATH = (PREVIEWS_PATH + '/full/%s/%d.png')
 # paths for images, e.g. mozcdn.com/amo or '/static'
 STATIC_URL = SITE_URL
 ADDON_ICONS_DEFAULT_URL = MEDIA_URL + '/img/addon-icons'
-ADDON_ICON_BASE_URL = MEDIA_URL + 'img/amo2009/icons/'
+ADDON_ICON_BASE_URL = MEDIA_URL + 'img/icons/'
 ADDON_ICON_URL = "%s/%s/%s/images/addon_icon/%%d-%%d.png?modified=%%s" % (
         STATIC_URL, LANGUAGE_CODE, DEFAULT_APP)
 PREVIEW_THUMBNAIL_URL = (STATIC_URL +