diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
index 7dd94f9..1a35cbe 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
@@ -831,7 +831,7 @@
   display:none;
 }
 
-.toggle-content a {
+.toggle-content a[href="#"] {
   text-decoration:none;
 }
 
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
index 94391fd..97b831a 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
@@ -582,13 +582,15 @@
   var toggleMe = $(".toggle-content-toggleme",div);
   if (div.hasClass("closed")) { // if it's closed, open it
     toggleMe.slideDown();
+    $(".toggle-content-text", obj).toggle();
     div.removeClass("closed").addClass("open");
     $(".toggle-content-img", div).attr("title", "hide").attr("src", toRoot + "assets/images/triangle-opened.png");
   } else { // if it's open, close it
-    toggleMe.slideUp();
-    div.removeClass("open").addClass("closed");
-    $(".toggle-content-img", div).attr("title", "show").attr("src", toRoot + "assets/images/triangle-closed.png");
+    toggleMe.slideUp('fast', function() {  // Wait until the animation is done before closing arrow
+      $(".toggle-content-text", obj).toggle();
+      div.removeClass("open").addClass("closed");
+      $(".toggle-content-img", div).attr("title", "show").attr("src", toRoot + "assets/images/triangle-closed.png");
+    });
   }
-  $(".toggle-content-text", obj).toggle();
   return false;
 }