diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index a848352b..9b634942 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -18,12 +18,33 @@ class Themelet {
 	public function build_thumb_html(Image $image, $query=null) {
 		global $config;
 		$h_view_link = make_link("post/view/{$image->id}", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "<a href='$h_view_link'><img title='$h_tip' alt='$h_tip' ".
 				"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
 	}
diff --git a/themes/default/themelet.class.php b/themes/default/themelet.class.php
index d45610b2..e0ee012e 100644
--- a/themes/default/themelet.class.php
+++ b/themes/default/themelet.class.php
@@ -31,12 +31,33 @@ class Themelet {
 		global $config;
 		$i_id = int_escape($image->id);
 		$h_view_link = make_link("post/view/$i_id", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "
 			<!-- cancel border -->
 			<div class='thumbblock'>
diff --git a/themes/flat/themelet.class.php b/themes/flat/themelet.class.php
index 1724f329..13e1424b 100644
--- a/themes/flat/themelet.class.php
+++ b/themes/flat/themelet.class.php
@@ -31,12 +31,33 @@ class Themelet {
 		global $config;
 		$i_id = int_escape($image->id);
 		$h_view_link = make_link("post/view/$i_id", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "
 			<div class='thumbblock'>
 			<div class='rr thumb'>
diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index 5985f2e2..b88fdec6 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -19,12 +19,33 @@ class Themelet {
 	public function build_thumb_html(Image $image, $query=null) {
 		global $config;
 		$h_view_link = make_link("post/view/{$image->id}", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "<a class='thumb' href='$h_view_link'><img title='$h_tip' alt='$h_tip' ".
 				"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
 	}
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index d5539d23..ea0297e0 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -31,12 +31,33 @@ class Themelet {
 		global $config;
 		$i_id = int_escape($image->id);
 		$h_view_link = make_link("post/view/$i_id", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "
 			<div class='thumbblock'>
 			
diff --git a/themes/old_default/themelet.class.php b/themes/old_default/themelet.class.php
index e7ed8967..35c7dc53 100644
--- a/themes/old_default/themelet.class.php
+++ b/themes/old_default/themelet.class.php
@@ -29,12 +29,33 @@ class Themelet {
 		global $config;
 		$i_id = int_escape($image->id);
 		$h_view_link = make_link("post/view/$i_id", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "<a class='thumb' href='$h_view_link'><img id='$i_id' title='$h_tip' alt='$h_tip' ".
 				"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
 	}
diff --git a/themes/warm/themelet.class.php b/themes/warm/themelet.class.php
index 8a3df34a..041274e1 100644
--- a/themes/warm/themelet.class.php
+++ b/themes/warm/themelet.class.php
@@ -31,13 +31,34 @@ class Themelet {
 		global $config;
 		$i_id = int_escape($image->id);
 		$h_view_link = make_link("post/view/$i_id", $query);
-		$h_tip = html_escape($image->get_tooltip());
 		$h_image_link = $image->get_image_link();
 		$h_thumb_link = $image->get_thumb_link();
-		if($image->ext == 'swf' || 'svg'){
+
+
+		// Removes the size tag if the file is an mp3 
+		if($image->ext == 'mp3'){
+			$iitip = $image->get_tooltip();
+			$mp3tip = array("0x0");
+			$h_tip = str_replace($mp3tip, " ", $iitip);
+		
+			// Makes it work with a variation of the default tooltips (I.E $tags // $filesize // $size)
+			$justincase = array("   //", "//   ", "  //", "//  ", "  ");
+				if(strstr($h_tip, "  ")){
+					$h_tip = html_escape(str_replace($justincase, "", $h_tip));
+				}else{
+				$h_tip = html_escape($h_tip);
+				}
+		}else{
+		$h_tip = html_escape($image->get_tooltip());
+		}
+		
+
+		// If file is flash or svg then sets thumbnail to max size.
+		if($image->ext == 'swf' || $image->ext == 'svg'){
 		$tsize = get_thumbnail_size('thumb_width', 'thumb_height'); }
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
+
 		return "
 			<div class='thumbblock'>
 			<div class='rr thumb'>