diff --git a/airtime_mvc/public/css/images/source-info_lines.png b/airtime_mvc/public/css/images/source-info_lines.png
index 75a1f435d..2da86de83 100644
Binary files a/airtime_mvc/public/css/images/source-info_lines.png and b/airtime_mvc/public/css/images/source-info_lines.png differ
diff --git a/airtime_mvc/public/css/images/source_to_switch_lines.png b/airtime_mvc/public/css/images/source_to_switch_lines.png
new file mode 100644
index 000000000..4501b46bd
Binary files /dev/null and b/airtime_mvc/public/css/images/source_to_switch_lines.png differ
diff --git a/airtime_mvc/public/css/masterpanel.css b/airtime_mvc/public/css/masterpanel.css
index 1da45dabe..f11bb3f4c 100644
--- a/airtime_mvc/public/css/masterpanel.css
+++ b/airtime_mvc/public/css/masterpanel.css
@@ -33,8 +33,8 @@
 			color:#bdbdbd;
 			margin:0;
 			height:15px;
-			padding-right:20px;
-			background:url(images/source-info_lines.png) no-repeat right 0;
+			padding-right:0;
+			overflow:visible;
 			}
 			.source-info-block li:first-child {
 				background-position: right -50px;
@@ -44,51 +44,90 @@
 				background-position: right -150px;
 				padding-top:3px;
 				}
-			.source-info-block li div {
-				display:inline-block;
-				margin-right:10px;
+			.source-info-block li div.source-label {
+				margin-right:0;
 				min-width:95px;
 				float:left;
 				height:15px;
 				line-height:14px;
 				padding:0 2px 0 3px;
 				background:#3e3e3e;
-				-webkit-border-radius:2px;
-				-moz-border-radius:2px;
-				border-radius:2px;
-				border-right:2px solid #3e3e3e;
+				-webkit-border-radius:2px 0 0 2px;
+				-moz-border-radius:2px 0 0 2px;
+				border-radius:2px 0 0 2px;
 				}
+				.source-info-block li div.source-label.ready {
+					background:#2f2e2e;
+					color:#fff;
+					}
+			.source-info-block li .line-to-switch, .source-info-block li .line-to-switch.off {
+				margin:0;
+				width:12px;
+				float:left;
+				height:15px;
+				padding:0;
+				border-left:2px solid #3e3e3e;
+				background:url(images/source_to_switch_lines.png) repeat-x 0 0;
+				}
+				.source-info-block li .line-to-switch.off {
+					border-color:#3e3e3e;
+					background:url(images/source_to_switch_lines.png) repeat-x 0 0;
+					}
+				.source-info-block li .line-to-switch.on {
+					border-color:#ff611f;
+					background:url(images/source_to_switch_lines.png) repeat-x 0 -15px;
+					}
+			.source-info-block li .line-to-on-air, .source-info-block li .line-to-on-air.off {
+				margin:0;
+				width:20px;
+				float:left;
+				height:15px;
+				padding:0;
+				background:url(images/source_to_switch_lines.png) repeat-x 0 0;
+				}
+				.source-info-block li .line-to-on-air, .source-info-block li .line-to-on-air.off {
+					margin:0;
+					width:20px;
+					float:left;
+					height:15px;
+					padding:0;
+					background:url(images/source-info_lines.png) repeat-x 0 0;
+					}
+					.source-info-block li .line-to-on-air.off  {
+						background:url(images/source-info_lines.png) no-repeat 0 0;
+						}
+					.source-info-block li .line-to-on-air.on {
+						background:url(images/source-info_lines.png) no-repeat 0 -15px;
+						}
 
-.source-info-block li.ready {
+
+.source-info-block li.active {
 	background-position: right -15px;
 	}
-	.source-info-block li.ready:first-child {
+	.source-info-block li.active:first-child {
 		background-position: right -70px;
 		}
-	.source-info-block li.ready:last-child {
+	.source-info-block li.active:last-child {
 		background-position: right -170px;
 		padding-top:3px;
 		}
-.source-info-block li.active {
-	background-position: right -30px;
+	
+.source-info-block li:first-child .line-to-on-air, .source-info-block li:first-child .line-to-on-air.off {
+	background-position: right -50px;
+	margin-bottom:-3px;
+	height:18px;
 	}
-	.source-info-block li.active:first-child {
-		background-position: right -90px;
-		}
-	.source-info-block li.active:last-child {
-		background-position: right -190px;
-		padding-top:3px;
-		}		
-.source-info-block li.ready div, .source-info-block li.active div {
-	background:#2f2e2e;
-	border-color:#ff611f;
-	color:#fff;
+.source-info-block li:first-child .line-to-on-air.on {
+	background-position: right -70px;
 	}
-.source-info-block li.kicked div {
-	color:#737373;
-	}
-
-
+.source-info-block li:last-child .line-to-on-air, .source-info-block li:last-child .line-to-on-air.off {
+	background-position: right -150px;
+	margin-top:-3px;
+	height:18px;
+	}	
+.source-info-block li:last-child .line-to-on-air.on {
+	background-position: right -170px;
+	}	
 
 .source-switch-button {
 	font-size:11px;