diff --git a/trunk/images/tango/go-first.png b/trunk/images/tango/go-first.png
new file mode 100644
index 0000000..5e2a6b1
Binary files /dev/null and b/trunk/images/tango/go-first.png differ
diff --git a/trunk/images/tango/go-last.png b/trunk/images/tango/go-last.png
new file mode 100644
index 0000000..48fe95b
Binary files /dev/null and b/trunk/images/tango/go-last.png differ
diff --git a/trunk/images/tango/go-previous.png b/trunk/images/tango/go-previous.png
new file mode 100644
index 0000000..c37bc04
Binary files /dev/null and b/trunk/images/tango/go-previous.png differ
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 3630784..14176d3 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -180,6 +180,11 @@ span.videotitle
 	font-size:			1.5em;
 }
 
+table.results
+{
+	display:			inline;
+}
+
 table.videometadata
 {
 	border-width:	0px;
diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index 12ecb81..883d8cf 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -8,7 +8,8 @@
 >
 
 <xsl:template name="innerresults">
-	<table class="results" align="center">
+
+	<table class="results">
 		<xsl:for-each select="//results/result">
 			<tr class="result">
 				<td>
@@ -168,12 +169,12 @@
 	<div>
 		<xsl:value-of select="//results/@resultcount" /> results on <xsl:value-of select="//results/@lastpage" /> pages
 	</div>
-	
-	<xsl:call-template name="pagination"/>
-	
+
+	<xsl:call-template name="pagination-numbers"/>	
+	<xsl:call-template name="pagination-arrows"/>
 	<xsl:call-template name="innerresults"/>
-	
-	<xsl:call-template name="pagination"/>
+	<xsl:call-template name="pagination-arrows"/>
+	<xsl:call-template name="pagination-numbers"/>
 	
 	<div>
 		<form method="get">
@@ -293,85 +294,91 @@
 			</fieldset>
 		</form>
 	</div>
-
+	
 </xsl:template>
 
-<xsl:template name="pagination">
+<xsl:template name="pagination-arrows">
 	<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&amp;orderby=', //results/@orderby, '&amp;sort=', //results/@sort, '&amp;pagesize=', //results/@pagesize)" />
 	<div>
 		<xsl:choose>
 			<xsl:when test="//results/@currentpage&lt;=1">
-				&lt;&lt; &lt;
+				<img src="./images/placeholder32x32.png" />
+				<img src="./images/placeholder32x32.png" />
 			</xsl:when>
 			<xsl:otherwise>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=1')" />
 					</xsl:attribute>
-					&lt;&lt;
+					<img src="./images/tango/go-first.png" />
 				</a>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
 					</xsl:attribute>
-					&lt;
+					<img src="./images/tango/go-previous.png" />
 				</a>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:if test="//results/@currentpage > 2">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 2)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage - 2" />
-			</a>
-		</xsl:if>
-		<xsl:if test="//results/@currentpage > 1">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage - 1" />
-			</a>
-		</xsl:if>
-		<xsl:value-of select="//results/@currentpage" />
-		<xsl:variable name="temp" select="//results/@lastpage - //results/@currentpage" />
-		<xsl:if test="$temp > 0">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage + 1" />
-			</a>
-		</xsl:if>
-		<xsl:if test="$temp > 1">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 2)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage + 2" />
-			</a>
-		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="//results/@lastpage&lt;=//results/@currentpage">
-				&gt; &gt;&gt;
+				<img src="./images/placeholder32x32.png" />
+				<img src="./images/placeholder32x32.png" />
 			</xsl:when>
 			<xsl:otherwise>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
 					</xsl:attribute>
-					&gt;
+					<img src="./images/tango/go-next.png" />
 				</a>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=', //results/@lastpage)" />
 					</xsl:attribute>
-					&gt;&gt;
+					<img src="./images/tango/go-last.png" />
 				</a>
 			</xsl:otherwise>
 		</xsl:choose>
 	</div>
 </xsl:template>
 
+<xsl:template name="pagination-numbers">
+	<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&amp;orderby=', //results/@orderby, '&amp;sort=', //results/@sort, '&amp;pagesize=', //results/@pagesize)" />
+	<xsl:if test="//results/@currentpage > 2">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 2)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage - 2" />
+		</a>
+	</xsl:if>
+	<xsl:if test="//results/@currentpage > 1">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage - 1" />
+		</a>
+	</xsl:if>
+	<xsl:value-of select="//results/@currentpage" />
+	<xsl:variable name="temp" select="//results/@lastpage - //results/@currentpage" />
+	<xsl:if test="$temp > 0">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage + 1" />
+		</a>
+	</xsl:if>
+	<xsl:if test="$temp > 1">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 2)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage + 2" />
+		</a>
+	</xsl:if>
+</xsl:template>
+
 </xsl:stylesheet>