diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java
index fa530fa4f..5ed9959d0 100755
--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java
@@ -72,19 +72,19 @@ class RepoSourcesAdapter {
                     return imgFactory.getImage("source_icon16.png");
 
                 } else if (element instanceof PlatformPackage) {
-                    return imgFactory.getImage("red_ball_icon16.png");
+                    return imgFactory.getImage("android_icon_16.png");
 
                 } else if (element instanceof AddonPackage) {
-                    return imgFactory.getImage("green_ball_icon16.png");
+                    return imgFactory.getImage("addon_icon16.png");
 
                 } else if (element instanceof ToolPackage) {
-                    return imgFactory.getImage("blue_ball_icon16.png");
+                    return imgFactory.getImage("tool_icon16.png");
 
                 } else if (element instanceof DocPackage) {
-                    return imgFactory.getImage("purple_ball_icon16.png");
+                    return imgFactory.getImage("doc_icon16.png");
 
                 } else if (element instanceof Package) {
-                    return imgFactory.getImage("gray_ball_icon16.png");
+                    return imgFactory.getImage("extra_pkg_icon16.png");
 
                 } else if (element instanceof Archive) {
                     if (((Archive) element).isCompatible()) {
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/addon_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/addon_icon16.png
new file mode 100755
index 000000000..1a3e0f28c
Binary files /dev/null and b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/addon_icon16.png differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/blue_ball_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/blue_ball_icon16.png
deleted file mode 100755
index 2936a0ad4..000000000
Binary files a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/blue_ball_icon16.png and /dev/null differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/doc_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/doc_icon16.png
new file mode 100755
index 000000000..8f56cb0bc
Binary files /dev/null and b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/doc_icon16.png differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/gray_ball_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/gray_ball_icon16.png
deleted file mode 100755
index 23ef0d2a3..000000000
Binary files a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/gray_ball_icon16.png and /dev/null differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/green_ball_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/green_ball_icon16.png
deleted file mode 100755
index 12a115779..000000000
Binary files a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/green_ball_icon16.png and /dev/null differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/purple_ball_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/purple_ball_icon16.png
deleted file mode 100755
index e317f5978..000000000
Binary files a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/purple_ball_icon16.png and /dev/null differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/red_ball_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/red_ball_icon16.png
deleted file mode 100755
index a4c18d8ba..000000000
Binary files a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/red_ball_icon16.png and /dev/null differ
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/tool_icon16.png b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/tool_icon16.png
new file mode 100755
index 000000000..8ca7710f3
Binary files /dev/null and b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/tool_icon16.png differ