diff --git a/css/media_browser_plus.views.css b/css/media_browser_plus.views.css
index f07fb05..cf7c53a 100644
--- a/css/media_browser_plus.views.css
+++ b/css/media_browser_plus.views.css
@@ -20,16 +20,25 @@
 .view .mbp-folders li.open {
   cursor: pointer;
   list-style-type: none;
+  margin-bottom: 1px;
+  margin-top: 1px
 }
 
 .view .mbp-folders li .icon {
-  margin-top: 2px;
-  width: 20px;
-  padding-left: 20px;
-  height: 20px;
+  padding: 0px 11px 1px 20px;
   line-height: 20px;
   display: inline;
-  background: url('../images/icons/folder.png') no-repeat;
+  background: url('../images/icons/folder_icons.png') 0 0 no-repeat;
+}
+
+.view .mbp-folders li.open > div.folder-name .icon {
+  background: url('../images/icons/folder_icons.png') 0 -20px no-repeat;
+}
+.view .mbp-folders li.active > div.folder-name .icon {
+  background: url('../images/icons/folder_icons.png') -31px 0px no-repeat;
+}
+.view .mbp-folders li.active.open > div.folder-name .icon {
+  background: url('../images/icons/folder_icons.png') -31px -20px no-repeat;
 }
 
 .view .mbp-folders li.active > div.folder-name {
@@ -45,7 +54,7 @@
 }
 
 .view .mbp-folders li .ajax-progress-throbber {
-  float: left;
+  float: right;
 }
 
 .view .mbp-file-list {
diff --git a/images/icons/folder-empty.png b/images/icons/folder-empty.png
deleted file mode 100644
index 2699244..0000000
Binary files a/images/icons/folder-empty.png and /dev/null differ
diff --git a/images/icons/folder.png b/images/icons/folder.png
deleted file mode 100644
index a71431b..0000000
Binary files a/images/icons/folder.png and /dev/null differ