diff --git a/build.gradle b/build.gradle
index 69b3e0afe3..3e75dd7203 100644
--- a/build.gradle
+++ b/build.gradle
@@ -879,8 +879,11 @@ reference {
 task api(type: Javadoc) {
     group = 'Documentation'
     description = 'Generates aggregated Javadoc API documentation.'
-    options.overview = 'src/api/overview.html'
+    title = "${rootProject.description} ${version} API"
     options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+    options.author = true
+    options.header = rootProject.description
+    options.overview = 'src/api/overview.html'
     source subprojects.collect { project ->
         project.sourceSets.main.allJava
     }
@@ -967,7 +970,7 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
             from subproject.sourcesJar
             from subproject.javadocJar
         }
-   }
+    }
 }
 
 // Create an optional "with dependencies" distribution.
diff --git a/src/api/doc-files/th-background.png b/src/api/doc-files/th-background.png
deleted file mode 100644
index 72d65e771f..0000000000
Binary files a/src/api/doc-files/th-background.png and /dev/null differ
diff --git a/src/api/spring-javadoc.css b/src/api/spring-javadoc.css
deleted file mode 100644
index c438fafa56..0000000000
--- a/src/api/spring-javadoc.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/* stylesheet.css 2008/04/22 nicolekonicki */
-
-/*
- *
- * Spring-specific Javadoc style sheet
- *
- */
-
-
-
-.code 
-{
-	border: 1px solid black;
-	background-color: #F4F4F4;
-	padding: 5px;
-}
-
-body 
-{
-	font: 12px Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-	background-color: #fff;
-	color: #333;
-}
-
-
-/* Link colors */
-a 
-{
-	color:#2c7b14;
-	text-decoration:none; 
-}
-
-a:hover 
-{
-	text-decoration:underline;
-}
-
-/* Headings */
-h1 
-{ 
-	font-size:28px;
-	color:#007c00; 
-}
-
-/* Table colors */
-
-table
-{
-	border:none;
-}
-
-td
-{
-	border:none;
-	border-bottom:1px dotted #ddd;
-}
-
-th
-{
-	border:none;
-}
-
-.TableHeadingColor th
-{
-	background-color: #efffcb;
-	background-image: url(doc-files/th-background.png);
-	background-repeat: repeat-x;
-	color:#fff;
-	font-size:14px;
-	height:26px;
-}
-
-.TableSubHeadingColor  
-{ 
-	background: #f7ffee;
-
-} 
-.TableRowColor         
-{ 
-	background: #fff;
-}
-
-.TableRowColor a      
-{ 
-	border-bottom:none;
-	color:#2c7b14;
-	font-weight:normal;
-}
-
-tr.TableRowColor:hover
-{
-	background:#eef2e1;
-}
-
- 
-/* Font used in left-hand frame lists */
-.FrameTitleFont   
-{ 
-	font-size: 120%; 
-	font-weight:bold;
-}
-
-.FrameTitleFont a   
-{  
-	color: #333;
-}
-
-.FrameHeadingFont 
-{ 
-	font-weight: bold;
-	font-size:95%;
-}
-
-.FrameItemFont    
-{ 
-	line-height:130%;
-	font-size: 95%; 
-}
-
-.FrameItemFont a
-{
-	color:#333;
-}
-
-.FrameItemFont a:hover
-{
-	color:#249901;
-	border-bottom:none;
-	text-decoration:underline;
-}
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    
-{ 
-	background-color:#fff;
-	border:none;
-} 
-
-.NavBarCell1Rev 
-{ 
-	background-color:#e3faa5;
-	border:1px solid #9ad00c;
-	padding:0;
-	margin:0;
-} 
-
-.NavBarCell1 a  
-{ 
-	color:#333;
-	text-decoration:none;
-}
-
-.NavBarFont1Rev 
-{ 
-
-}
-
-.NavBarCell2
-{
-	border:none;
-}
-
-.NavBarCell2 a    
-{ 
-	color:#249901;
-	font-size:90%;
-}
-
-.NavBarCell3    
-{ 
-	border:none;
-}
-
-/* Override sizes in font tags */
-font
-{
-	font: inherit !important;
-}