diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 059079a71..8e0efdbc3 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -87,6 +87,32 @@
 			$label_search = $_SESSION["prefs_label_search"];
 		}
 
+		print "<div id=\"colorPicker\" style=\"display : none\">";
+		
+		$color_picker_pairs = array(
+			array('#063064', '#fff7d5'),
+			array('#ffffff', '#00ccff'),
+			array('#ffffff', '#cc00ff'),
+			array('#ffffff', '#00ffcc'),
+			array('#ffffff', '#0000ff'),
+			array('#ffffff', '#ff00ff'),
+			array('#ffffff', '#ff0000'),
+			array('#394f00', '#ccff00'));
+
+		foreach ($color_picker_pairs as $c) { 
+			$fg_color = $c[0];
+			$bg_color = $c[1];
+
+			print "<div class='colorPickerEntry' 
+				style='color : $fg_color; background-color : $bg_color;'
+				onclick=\"colorPickerDo('$fg_color', '$bg_color')\">z</div>";
+
+		}
+
+		print "<br clear='both'>";
+
+		print "</div>";
+
 		print "<div class=\"feedEditSearch\">
 			<input id=\"label_search\" size=\"20\" type=\"search\"
 				onfocus=\"javascript:disableHotkeys();\" 
@@ -160,10 +186,19 @@
 					onclick='toggleSelectPrefRow(this, \"label\");' 
 					type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
 	
-				print "<td><span class='prefsLabelEntry' 
+/*				$id = $line['id'];
+
+				print "<td width='30' align='center'>
+					<div class='labelColorIndicator' 
 					style='color : $fg_color; background-color : $bg_color'
+					onclick=\"colorPicker(this, '$id', '$fg_color', '$bg_color')\">z</div>";
+
+				print "</td>"; */
+
+				print "<td><span class='prefsLabelEntry' 
 					id=\"LILT-".$line["id"]."\">" . $line["caption"] . 
-					"</span></td>";
+					"</span>";
+
 
 				print "</tr>";
 	
diff --git a/prefs.js b/prefs.js
index 5597dfdbe..a3d38c9de 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1968,4 +1968,15 @@ function batchFeedsToggleField(cb, elem, label) {
 	}
 }
 
+function colorPicker(caller, id, fg, bg) {
+	try {
+		var picker = document.getElementById("colorPicker");
 
+
+		picker.style.left = caller.offsetLeft;
+		picker.style.top = caller.offsetTop;
+
+	} catch (e) {
+		exception_error("colorPicker", e);
+	}
+}
diff --git a/tt-rss.css b/tt-rss.css
index fcc4c7b59..ba69820fd 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2092,10 +2092,32 @@ span.prefsLabelEntry {
 }
 
 div.labelColorIndicator {
-	float : right;
 	height : 14px;
 	width : 14px;
 	line-height : 14px;
 	font-height : 9px;
 	text-align : center;
+	border : 1px solid black;
+}
+
+div.colorPickerEntry {
+	height : 15px;
+	width : 15px;
+	line-height : 13px;
+	font-height : 9px;
+	text-align : center;
+	border : 1px solid black;
+	margin : 5px 5px 0px 0px;
+	float : left;
+}
+
+div#colorPicker {
+	border : 1px solid #cccccc;
+	background : #f0f0f0;
+	width : 110px;
+	padding : 0px 0px 5px 5px;
+	position : absolute;
+	left : 150px;
+	top : 50px;
+	z-index : 3;
 }