Adjust the latest GUI

Change-Id: I4ea5ebe7b7d9e1922d478a0d2b0896b705b3c5b1

32 files changed, 141 insertions, 116 deletions

diff --git a/demos/tizen-winsets/widgets/grid/namecard.css b/demos/tizen-winsets/widgets/grid/namecard.css
index e8f7be7b..d417eca8 100644
--- a/demos/tizen-winsets/widgets/grid/namecard.css
+++ b/demos/tizen-winsets/widgets/grid/namecard.css
@@ -57,6 +57,7 @@
 .ui-demo-namecard-span-x {
 	color : gray;
 	font-size : 0.6rem;
+	text-align: center;
 	width: 5rem;
 	display: block;
 	white-space : nowrap;
@@ -69,6 +70,7 @@
 .ui-demo-namecard-contents span.name {
 	color : gray;
 	font-size : 0.6rem;
+	text-align: center;
 	width: 4rem;
 	display: inline-block;
 	white-space : nowrap;
diff --git a/demos/tizen-winsets/widgets/tabbar/tabbar.css b/demos/tizen-winsets/widgets/tabbar/tabbar.css
index 10b092ba..012a9d69 100644
--- a/demos/tizen-winsets/widgets/tabbar/tabbar.css
+++ b/demos/tizen-winsets/widgets/tabbar/tabbar.css
@@ -1,9 +1,7 @@
-.ui-btn-up-s .ui-icon-tabedit {
+.ui-icon-tabedit {
 	background-image: url(00_tab_edit.png);
 }
 
-.ui-btn-hover-s .ui-icon-tabedit,
-.ui-btn-active.ui-btn-up-s .ui-icon-tabedit,
-.ui-btn-down-s .ui-icon-tabedit {
+.ui-btn-active .ui-icon-tabedit {
 	background-image: url(00_tab_edit_press.png);
 }
diff --git a/src/themes/tizen/common/jquery.mobile.button.less b/src/themes/tizen/common/jquery.mobile.button.less
index 4f60202c..afee64c5 100644
--- a/src/themes/tizen/common/jquery.mobile.button.less
+++ b/src/themes/tizen/common/jquery.mobile.button.less
@@ -124,8 +124,8 @@
 .ui-btn.ui-btn-edit .ui-icon { width: @width_buttonEdit; height: @height_buttonEdit; }
 
 /* Padding for Icon with text */
-.ui-btn .ui-btn-text.ui-btn-text-padding-left { padding-left: 44 * @unit_base; }
-.ui-btn .ui-btn-text.ui-btn-text-padding-right { padding-right: 48 * @unit_base; }
+.ui-btn .ui-btn-text.ui-btn-text-padding-left { padding-left: 20 * @unit_base; }
+.ui-btn .ui-btn-text.ui-btn-text-padding-right { padding-right: 32 * @unit_base; }
 .ui-btn .ui-btn-text.ui-btn-text-padding-top {padding-top: 32 * @unit_base;}
 .ui-icon
 {
diff --git a/src/themes/tizen/common/jquery.mobile.collapsible.less b/src/themes/tizen/common/jquery.mobile.collapsible.less
index b6e4a0e0..70972167 100644
--- a/src/themes/tizen/common/jquery.mobile.collapsible.less
+++ b/src/themes/tizen/common/jquery.mobile.collapsible.less
@@ -45,7 +45,7 @@
 		padding-left: 40px;
 	}
 	.ui-btn-icon-right .ui-btn-inner {
-		padding-left: 12px; padding-right: 40px;
+		padding-left: 0px; padding-right: 40px;
 	}
 	.ui-btn-icon-top .ui-btn-inner,
 	.ui-btn-icon-bottom .ui-btn-inner { padding-right: 40px; text-align: center; }
diff --git a/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less b/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less
index 45dc946f..4d28ebde 100644
--- a/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less
+++ b/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less
@@ -130,15 +130,15 @@
 	background-image: url(images/00_check_checking.png), url(images/00_check_bg.png);
 	background-repeat: no-repeat;
 }
-.ui-icon-checkbox-off-press {
+.ui-btn-down-s .ui-icon-checkbox-off {
 	width: @checkbox-radio-size-width;
 	height: @checkbox-radio-size-height;
-	background-image: url(images/00_check_bg_press.png);
+	background-image: url(images/00_check_press.png), url(images/00_check_bg_press.png);
 }
-.ui-icon-checkbox-on-press {
+.ui-btn-down-s .ui-icon-checkbox-on {
 	width: @checkbox-radio-size-width;
 	height: @checkbox-radio-size-height;
-	background-image: url(images/00_check_checking.png), url(images/00_check_bg_press.png);
+	background-image: url(images/00_check_press.png), url(images/00_check_bg_press.png);
 	background-repeat: no-repeat;
 }
 .favorite {
@@ -166,13 +166,13 @@
 	height: @checkbox-radio-size-height;
 	background-image: url(images/00_button_radio_select.png), url(images/00_button_radio.png);
 }
-.ui-icon-radio-on-press {
+.ui-btn-down-s .ui-icon-radio-on {
 	width: @checkbox-radio-size-width;
 	height: @checkbox-radio-size-height;
-	background-image: url(images/00_button_radio.png);
+	background-image: url(images/00_button_radio_press.png), url(images/00_button_radio_press_bg.png);
 }
-.ui-icon-radio-off-press {
+.ui-btn-down-s .ui-icon-radio-off {
 	width: @checkbox-radio-size-width;
 	height: @checkbox-radio-size-height;
-	background-image: url(images/00_button_radio.png);
+	background-image: url(images/00_button_radio_press.png), url(images/00_button_radio_press_bg.png);
 }
diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less
index a9bfc181..32630900 100644
--- a/src/themes/tizen/common/jquery.mobile.listview.less
+++ b/src/themes/tizen/common/jquery.mobile.listview.less
@@ -335,6 +335,7 @@ li.ui-li-thumbnail-right {
 
 		padding-top : 0px;
 		padding-bottom : 0px;
+		color : @color_list_editfield;
 	}
 }
 
@@ -444,7 +445,7 @@ li.ui-li-thumbnail-right {
 		width : 100%;
 		height : 2 * @unit_base;
 
-		background : @color_list_divider_text;
+		background : @color_list_divider_line;
 	}
 
 	&.ui-btn-down-s {
@@ -616,7 +617,7 @@ li.ui-li-thumbnail-right {
 
 	position : absolute;
 	right : 0px;
-	top : 16 * @unit_base;
+	top : 12 * @unit_base;
 
 	width : 60%;
 	.LESStext-ellipsis();
@@ -852,6 +853,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 		&.ui-li-bubble-left {
 			color: @color_list_bubble_receive_text;
 			> .ui-li-bubble-time {
+				text-align: left;
 				color: @color_list_bubble_time_receive_text;
 			}
 		}
@@ -859,6 +861,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 		&.ui-li-bubble-right {
 			color: @color_list_bubble_sent_text;
 			> .ui-li-bubble-time {
+				text-align: right;
 				color: @color_list_bubble_time_sent_text;
 			}
 		}
@@ -877,6 +880,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 
 	span.ui-li-bubble-time {
 		font-weight: bold;
+		width: 70 * @unit_base;
 	}
 	// Common
 	.ui-li-bubble-receive,
@@ -902,9 +906,9 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 	.ui-li-bubble-left {
 		//float: left;
 		margin-left: 0px;
-		margin-right: 1.6rem;
+		margin-right: 100 * @unit_base;
 		border-image-source: url(images/00_messagebubble_bg_receive.9.png);
-		border-image-slice: 57 14 21 48 fill;
+		border-image-slice: 60 23 20 57 fill;
 		border-image-width: auto;
 		padding: 9px 14px 21px 48px;
 
@@ -918,7 +922,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 	}
 	.ui-li-bubble-sent,
 	.ui-li-bubble-right {
-		margin-left: 1.6rem;
+		margin-left: 100 * @unit_base;
 		margin-right: 0px;
 		border-image-source: url(images/00_messagebubble_bg_sent.9.png);
 		border-image-slice: 55 47 20 13 fill;
diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less
index 428ae5d8..cb2340ce 100644
--- a/src/themes/tizen/common/jquery.mobile.theme.less
+++ b/src/themes/tizen/common/jquery.mobile.theme.less
@@ -115,10 +115,10 @@
 	img {
 		position : absolute;
 		display: inline-block;
-		height: 16 * @unit_base;
-		width: 16 * @unit_base;
+		height: 20 * @unit_base;
+		width: 20 * @unit_base;
 		margin-left: 8 * @unit_base;
-		margin-top : 24 * @unit_base;
+		margin-top : 22 * @unit_base;
 	}
 
 	.ui-title-text-sub {
@@ -214,7 +214,7 @@
 	
 	&.ui-title-multiline {
 		img {
-			margin-top : 14 * @unit_base;
+			margin-top : 23 * @unit_base;
 		}
 
 		.ui-title {
@@ -224,6 +224,9 @@
 
 			margin: 9*@unit_base 8*@unit_base 22*@unit_base 8*@unit_base;
 		}
+		img + .ui-title + .ui-title-text-sub {
+			left : 33 * @unit_base;
+		}
 	}
 	
 }
@@ -280,7 +283,7 @@
 	>[data-role="button"] {
 		font-size : 15 * @unit_base;
 		font-weight : bold;
-		color : @color_tabbar_btn_normal;
+		color : @color_button_text_normal;
 	}
 
 	[data-role="controlgroup"] {
@@ -329,7 +332,7 @@
 			}
 			.ui-btn-text {
 				font-size : 17 * @unit_base;
-				color : rgba(58, 58, 58, 1);
+				color : color_button_text_normal;
 			}
 
 			&.ui-corner-right {
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.notification.less b/src/themes/tizen/common/jquery.mobile.tizen.notification.less
index 08e689dc..d99b2f47 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.notification.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.notification.less
@@ -193,5 +193,6 @@
 	margin-bottom: 4 * @unit_base;
 	margin-left: 8 * @unit_base;
 	margin-right: 8 * @unit_base;
+	padding-top: 8 * @unit_base;
 	color: @color_smallpopup_text;
 }
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.popup.less b/src/themes/tizen/common/jquery.mobile.tizen.popup.less
index dc8a4a80..2c5cacd2 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.popup.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.popup.less
@@ -29,7 +29,6 @@
 	position: absolute;
 	width: @popup-ratio;
 	z-index: (@z_base_popup + 1) !important;
-	background:		@color_popup_text_bg;
 	text-align: center;
 	outline-color: @color_list_bg;
 	.LESSdisplaybox();
@@ -47,13 +46,18 @@
 			width : 100%;
 		}
 		word-wrap : break-word;
+		-ms-border-radius : .3em;
+		-o-border-radius : .3em;
+		-webkit-border-radius : .3em;
+		-moz-border-radius : .3em;
+		border-radius : .3em;
 	}
 
 	.ui-popup-title {
 		width: 100%;
 		height: 40 * @unit_base;
 		text-align : left;
-		color : @color_bar_title_text;
+		color : @color_popup_title_text;
 
 		font-size: @font_size_popup_basic_style_title;
 		font-weight : bold;
@@ -61,7 +65,7 @@
 		h1 {
 			font-size: @font_size_popup_basic_style_title;
 			font-weight : bold;
-			color : @color_bar_title_text;
+			color : @color_popup_title_text;
 
 			margin : 0px;
 			padding-top : 10 * @unit_base;
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less b/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less
index d153b80a..b046dbc0 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less
@@ -22,7 +22,6 @@
 		color-stop(1, @color_progress_value1)
 	);
 	.LESSborder-radius-all( 10 * @unit_base );
-	.LESSbox-shadow(-1px, -1px, 1px, rgb(179, 200, 226));
 }
 
 .ui-progressbar-bg {
@@ -38,7 +37,6 @@
 	border: 1px;
 	border-style: solid;
 	border-color: @color_progress_border;
-	.LESSbox-shadow(1px, -1px, 1px, @color_progress_border);
 	background-color: @color_progress_bar0;
 }
 
@@ -57,6 +55,6 @@
 		color-stop(0, @color_progress_bar1),
 		color-stop(1, @color_progress_bar0)
 	);
-	.LESSbox-shadow(1px, 1px, 0px, white);
+	.LESSbox-shadow(0px, 0px, 2px, @color_progress_shadow);
 	.LESSborder-radius-all( 10 * @unit_base );
 }
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less
index 8b90007d..d8341648 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less
@@ -55,7 +55,7 @@
 	width:  5 * @unit_base;
 	height: 100%;
 	.LESSborder-radius-all(2 * @unit_base);
-	.LESSbox-shadow(1 * @unit_base, 1 * @unit_base, 2 * @unit_base, rgb(148, 146, 140))
+	.LESSbox-shadow(1 * @unit_base, 1 * @unit_base, 4 * @unit_base, @color_scrollbar_thumb_shadow)
 }
 
 .ui-scrollbar-x .ui-scrollbar-thumb {
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.slider.less b/src/themes/tizen/common/jquery.mobile.tizen.slider.less
index f45227b1..ee17ef6e 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.slider.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.slider.less
@@ -32,7 +32,7 @@ select.ui-slider-switch {
 		color-stop(0, @color_progress_bar1),
 		color-stop(1, @color_progress_bar0)
 	);
-	.LESSbox-shadow(1px, 1px, 0px, white);
+	.LESSbox-shadow(0px, 0px, 2px, @color_progress_shadow);
 	.LESSborder-radius-all( 10 * @unit_base );
 }
 
@@ -112,7 +112,6 @@ div.ui-slider:not(.ui-toggle-switch) {
 	border: 1px;
 	border-style: solid;
 	border-color: @color_progress_border;
-	.LESSbox-shadow(1px, 1px, 0px, @color_progress_shadow);
 	background-color: @color_progress_bar0;
 
 	.ui-btn {
@@ -172,7 +171,6 @@ a.ui-slider-handle {
 		color-stop(1, @color_progress_value1)
 	);
 	.LESSborder-radius-all( 10 * @unit_base );
-	.LESSbox-shadow(-1px, -1px, 1px, rgb(179, 200, 226));
 }
 
 .ui-slider-handle-press {
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.splitview.less b/src/themes/tizen/common/jquery.mobile.tizen.splitview.less
index 399d4f38..54cd475c 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.splitview.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.splitview.less
@@ -1,5 +1,7 @@
 @import "config.less";
 
+@unit_base_splitview : @unit_base * 0.5;
+
 .ui-splitview {
 	margin: 0;
 	padding: 0;
@@ -25,7 +27,7 @@
 }
 .ui-splitview .ui-spliter-bar {
 	background-color: @color_splitview_spliter_bar;
-	border-color: black;
+	border-color: @color_splitview_spliter_border;
 	border-style: solid;
 }
 .ui-splitview .ui-spliter-handle {
@@ -41,45 +43,48 @@
 	background-size: 100% 100%;
 }
 .ui-direction-horizontal > .ui-spliter {
-	width: 60px;
+	width: 60 * @unit_base_splitview;
 }
 .ui-direction-vertical > .ui-spliter {
-	height: 60px;
+	height: 60 * @unit_base_splitview;
 }
 .ui-direction-horizontal > .ui-spliter > .ui-spliter-bar {
-	width: 13px;
-	margin: 0 0 0 25px;
-	border-width: 1px 1px 1px 0;
+	width: 13 * @unit_base_splitview;
+	margin: 0 0 0 25 * @unit_base_splitview;
+	border-width: 0 1px 0 1px;
 }
 .ui-direction-vertical > .ui-spliter > .ui-spliter-bar {
-	height: 13px;
-	margin: 25px 0 0 0;
-	border-width: 0 1px 1px 1px;
+	height: 13 * @unit_base_splitview;
+	margin: 25 * @unit_base_splitview 0 0 0;
+	border-width: 1px 0 1px 0;
 }
 .ui-spliter-active > .ui-spliter-bar {
 	background-color: @color_splitview_spliter_bar_active;
+	border-color: @color_splitview_spliter_bar_active;
 }
 .ui-direction-horizontal > .ui-spliter > .ui-spliter-bar > .ui-spliter-handle {
-	width: 13px;
-	height: 26px;
+	width: 13 * @unit_base_splitview;
+	height: 26 * @unit_base_splitview;
 	background-image: url(./images/00_splite_handler_v.png);
+	background-repeat:repeat-x;
 }
 .ui-direction-vertical > .ui-spliter > .ui-spliter-bar > .ui-spliter-handle {
-	width: 26px;
-	height: 13px;
+	width: 26 * @unit_base_splitview;
+	height: 13 * @unit_base_splitview;
 	background-image: url(./images/00_splite_handler_h.png);
+	background-repeat:repeat-y;
 }
 .ui-direction-horizontal > .ui-fixed {
-	width: 0px;
+	width: 0;
 }
 .ui-direction-horizontal > .ui-fixed > .ui-spliter-bar {
-	width: 5px;
+	width: 5 * @unit_base_splitview;
 }
 .ui-direction-vertical > .ui-fixed {
-	height: 0px;
+	height: 0;
 }
 .ui-direction-vertical > .ui-fixed > .ui-spliter-bar {
-	height: 5px;
+	height: 5 * @unit_base_splitview;
 }
 .ui-fixed .ui-spliter-handle {
 	display: none;
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less b/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less
index 2b97da81..712fd277 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less
@@ -62,7 +62,6 @@
 		}
 		a.ui-btn-hover-s.ui-btn-down-s {
 			&:not(.ui-state-persist) {
-				color : @color_tabbar_btn_pressed;
 				background: @color_tabbar_btn_tab_press;
 			}
 		}
@@ -81,7 +80,6 @@
 			}
 		}
 		a.ui-btn.ui-btn-hover-s.ui-btn-down-s {
-			color : @color_tabbar_btn_pressed;
 			background: @color_tabbar_btn_tab_press;
 		}
 	}
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less b/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less
index 5150ce73..5b891ebf 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less
@@ -61,7 +61,7 @@
 
 div.ui-tokentextarea-block {
 	background-color : @color_tokentextarea_block_bg;
-	background-image : url(./images/00_contacts_button_header.png);
+	background-image : -webkit-gradient(linear, left top, left bottom, from(@color_tokentextarea_block_bg), to(rgb(115, 148, 189)));
 	background-size : contain;
 	background-repeat : no-repeat;
 	padding-left : .7em;
@@ -69,7 +69,7 @@ div.ui-tokentextarea-block {
 
 div.ui-tokentextarea-sblock {
 	background-color : @color_tokentextarea_press_bg;
-	background-image : url(./images/00_contacts_button_header_press.png);
+	background-image : -webkit-gradient(linear, left top, left bottom, from(@color_tokentextarea_press_bg), to(rgb(75, 142, 222)));
 	background-size : contain;
 	background-repeat : no-repeat;
 	padding-left : .7em;
diff --git a/src/themes/tizen/tizen-white/images/00_contacts_button_header.png b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_left.png
index 20462252..8eca760f 100644
--- a/src/themes/tizen/tizen-white/images/00_contacts_button_header.png
+++ b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_left.png
diff --git a/src/themes/tizen/tizen-black/images/00_contacts_button_header_press.png b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_right.png
index 5c814b0f..9af8c07d 100644
--- a/src/themes/tizen/tizen-black/images/00_contacts_button_header_press.png
+++ b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_right.png
diff --git a/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png b/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png
index a4a7863d..20e8afcb 100644
--- a/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png
+++ b/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png
diff --git a/src/themes/tizen/tizen-black/images/00_splite_handler_h.png b/src/themes/tizen/tizen-black/images/00_splite_handler_h.png
index f6f2c97a..dfcc1b93 100644..100755
--- a/src/themes/tizen/tizen-black/images/00_splite_handler_h.png
+++ b/src/themes/tizen/tizen-black/images/00_splite_handler_h.png
diff --git a/src/themes/tizen/tizen-black/images/00_splite_handler_v.png b/src/themes/tizen/tizen-black/images/00_splite_handler_v.png
index d0cf6bb2..2ced25b8 100644..100755
--- a/src/themes/tizen/tizen-black/images/00_splite_handler_v.png
+++ b/src/themes/tizen/tizen-black/images/00_splite_handler_v.png
diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less
index fd701d48..8e128993 100644
--- a/src/themes/tizen/tizen-black/style.less
+++ b/src/themes/tizen/tizen-black/style.less
@@ -24,32 +24,35 @@
                    List
 ***************************************************************************/
 @color_list_bg:	rgba(32, 35, 39, 1);								/* B0211 */
-@color_list_press : rgba(87, 135, 194, 1);						/* B041	*/
-@color_list_border_bottom: rgba(45, 45, 45, 0.5);	/* B0221 */
+@color_list_press : rgba(112, 169, 238, 1);						/* B041	*/
+@color_list_border_bottom: rgba(12, 15, 20, 1);	/* B0223 */
 @color_list_main_text_focus: rgba(255, 255, 255, 1);
 @color_list_main_text_unfocus: rgba(215, 215, 215, 1);
 @color_list_sub_text_default: rgba(128, 128, 128, 1);
 
 @color_list_divider_expand_div : rgba(0, 0, 0, 0.5);
-@color_list_divider_bg : rgba(32, 35, 39, 1);			/* W021L1 */
-@color_list_divider_text : rgba(112, 169, 238, 1);			/* W021L2 */
+@color_list_divider_bg : rgba(32, 35, 39, 1);				/* W021L1 */
+@color_list_divider_line : rgba(59, 115, 182, 1);			/* W021L2 */
+@color_list_divider_text : rgba(112, 169, 238, 1);			/* W021L3 */
 
 @color_list_swipe_bg : rgba(23, 25, 28, 1);				/* B0212 */
 
 @color_list_dialogue_bg : rgba(42, 45, 48, 1);
-@color_dialogue_main_text: rgba(59, 115, 182, 1);
+@color_dialogue_main_text: rgba(112, 169, 238, 1);			/* F011L5 */
 @color_dialogue_border_right: rgba(12, 15, 20, 1);
 
 @color_list_expanded_bg : rgba(220, 218, 211, 1);
 
-@color_list_bubble_sent_text:	rgb(0, 0, 0);
-@color_list_bubble_receive_text:	rgb(255, 255, 255);
-@color_list_bubble_sos_text:	rgb(233, 73, 73);
-@color_list_bubble_date_text:	rgb(104, 104, 104);
+@color_list_editfield : rgba(215, 215, 215, 1);				/* F011L1 */
+
+@color_list_bubble_sent_text:	rgb(0, 0, 0);				/* W051 */
+@color_list_bubble_receive_text:	rgb(0, 0, 0);				/* W051 */
+@color_list_bubble_sos_text:	rgb(233, 73, 73);				/* F011L15 */
+@color_list_bubble_date_text:	rgb(104, 104, 104);		/* F011L18 */
 @color_list_bubble_date_bg:		rgba(225, 225, 225, 0);
-@color_list_bubble_time_sent_text:	rgb(57, 166, 215);
-@color_list_bubble_time_receive_text:	rgb(211, 0, 0);
-@color_list_bubble_time_sos_text:	rgb(211, 0, 0);
+@color_list_bubble_time_sent_text:	rgb(139, 139, 139);	/* F011L16 */
+@color_list_bubble_time_receive_text:	rgb(139, 139, 139);	/* F011L17 */
+@color_list_bubble_time_sos_text:	rgb(233, 73, 73);		/* F011L15 */
 @color_list_bubble_name_text:	rgb(139, 139, 139);
 @color_list_bubble_help_text:	rgb(154, 154, 154);
 @color_list_bubble_link_text:	rgb(34, 129, 157);
@@ -98,25 +101,25 @@
 @color_button_EditText:         rgb(249, 249, 249);
 @color_button_EditTextPress:    rgb(61, 61, 61);
 
-@color_button_text_normal:      rgb(58, 58, 58);
+@color_button_text_normal:      rgb(186, 186, 186);
 @color_button_text_press:       rgb(255, 255, 255);
 @color_button_text_white:       rgb(249, 249, 249);
 
-@color_button_normal:           rgb(32, 35, 39);
-@color_button_normal_webkit:    -webkit-linear-gradient(top, rgb(32, 35, 39), rgb(32, 35, 39));
-@color_button_normal_moz:       -moz-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226));
-@color_button_normal_o:         -o-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226));
-@color_button_normal_ms:        -ms-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226));
-@color_button_press:            rgb(59, 115, 182);
+@color_button_normal:           rgb(60, 64, 68);
+@color_button_normal_webkit:    -webkit-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51));
+@color_button_normal_moz:       -moz-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51));
+@color_button_normal_o:         -o-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51));
+@color_button_normal_ms:        -ms-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51));
+@color_button_press:            rgb(51, 99, 157);
 
-@color_button_inner:            rgb(32, 35, 39);
-@color_button_inner_webkit:     -webkit-linear-gradient(top, rgb(32, 35, 39), rgb(32, 35, 39));
-@color_button_inner_moz:        -moz-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240));
-@color_button_inner_o:          -o-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240));
-@color_button_inner_ms:         -ms-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240));
+@color_button_inner:            rgb(60, 64, 68);
+@color_button_inner_webkit:     -webkit-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49));
+@color_button_inner_moz:        -moz-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49));
+@color_button_inner_o:          -o-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49));
+@color_button_inner_ms:         -ms-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49));
 
-@button_shadow_outer:		0 0 1px 1px rgba(0, 0, 0, 1);
-@button_shadow_inner:		none;
+@button_shadow_outer:		0 0 1px 1px rgba(83, 86, 90, 1);
+@button_shadow_inner:		0 0 1px 1px rgba(67, 70, 73, 1);;
 
 @color_button_edit:		rgb(201, 88, 88);
 @color_button_edit_webkit:	-webkit-gradient(linear, left top, left bottom, from(rgb(201, 88, 88)), to(rgb(161, 40, 40)));
@@ -141,7 +144,7 @@
 	background: @color_button_normal_o;
 	background: @color_button_normal_ms;
 	border: 1px solid;
-	border-color: rgba(0, 0, 0, 1);
+	border-color: rgba(42, 44, 47, 1);
 	.LESSbox-shadow-line( @button_shadow_outer );
 }
 .LESSbutton_inner_box_style{
@@ -189,7 +192,7 @@
 @color_ctxpopup_border_top:             rgb(91, 91, 91);
 @color_ctxpopup_border_bottom:          rgb(45, 45, 45);
 
-@color_ctxbutton_press:            rgb(59, 115, 182);
+@color_ctxbutton_press:            rgb(42, 137, 194);		/* B044 */
 
 @color_ctxpopup_timepicker_text:        rgba( 255, 255, 255, 0.7 );
 @color_ctxpopup_timepicker_text_focus:  rgba( 255, 255, 255, 1 );
@@ -201,6 +204,7 @@
 @color_scrollbar: 		rgb(57, 59, 65);
 @color_scrollview_indicator_start:	rgb(186,186,186);
 @color_scrollview_indicator_end:	rgb(32,35,39);
+@color_scrollbar_thumb_shadow:		rgba(0, 0, 0, 50);
 
 /***************************************************************************
                    Date Time picker
@@ -220,6 +224,7 @@
 ***************************************************************************/
 @color_popup_center_progressbar_title:	rgba(153, 153, 153, 1);
 @color_popup_title_bg:		rgba(80, 147, 182, 255);	/* popup_title_bg.png */
+@color_popup_title_text:		rgba(125, 169, 221, 1);	/* B063L9 : Basic Style_title */
 
 @color_popup_button_bg:		rgba(42, 45, 48, 1);
 @color_popup_font: rgba(248, 246, 239, 1); /* maybe not use only popupwindow*/
@@ -274,7 +279,7 @@
 /***************************************************************************
                     Tickernoti
 ***************************************************************************/
-@color_ticker_bg:			rgb(68, 68, 68);
+@color_ticker_bg:			rgb(52, 52, 50);			/* B061L5 */
 @color_ticker_text1:			rgb(255, 255, 255);
 @color_ticker_text2:			rgb(255, 255, 255);
 @color_ticker_btn:			rgb(64, 64, 64);
@@ -284,14 +289,15 @@
 /***************************************************************************
                     Smallpopup
 ***************************************************************************/
-@color_smallpopup_bg:			rgb(68, 68, 68);
+@color_smallpopup_bg:			-webkit-linear-gradient(top, @color_bg 0%, rgb(153, 153, 153
+) 18%, rgb(68, 68, 68) 20%, rgb(68, 68, 68) 100%);
 @color_smallpopup_text:			rgb(255, 255, 255);
 
 /***************************************************************************
                     Slider
 ***************************************************************************/
 @color_slider_handle_text:		rgb(255, 255, 255);
-@color_slider_popup_text:		rgb(249, 249, 249);
+@color_slider_popup_text:		rgb(76, 81, 88);		/* W0632 */
 @color_slider_left_text:		rgb(186, 186, 186);
 @color_slider_right_text:		rgb(186, 186, 186);
 @color_slider_label_text:		rgb(255, 255, 255);
@@ -300,12 +306,13 @@
 /***************************************************************************
                     Progress
 ***************************************************************************/
-@color_progress_bar0:			rgb(0, 0, 0);
-@color_progress_bar1:			rgb(29, 31, 34);
-@color_progress_border:			rgb(29, 31, 34);
-@color_progress_value0:			rgb(54, 119, 195);
-@color_progress_value1:			rgb(29, 31, 34);
-@color_progress_shadow:			rgb(255, 255, 255);
+@color_progress_bar0:			rgb(26, 27, 29);
+@color_progress_bar1:			rgb(46, 47, 51);
+@color_progress_outline:			rgb(57, 59, 63);
+@color_progress_border:			rgb(32, 33, 35);
+@color_progress_value0:			rgb(82, 136, 201);
+@color_progress_value1:			rgb(54, 90, 113);
+@color_progress_shadow:			rgb(60, 62, 67);
 
 
 /***************************************************************************
@@ -349,13 +356,14 @@
                    tokentextarea
 ***************************************************************************/
 @color_tokentextarea_block_text : rgb(255, 255, 255);
-@color_tokentextarea_block_bg : rgb(95, 138, 189);
-@color_tokentextarea_press_bg : rgb(54, 89, 132);
+@color_tokentextarea_block_bg : rgb(118, 157, 204);    /* W0711 : Contact button bg normal */
+@color_tokentextarea_press_bg : rgb(64, 147, 247);     /* W0713 : Contact button bg press */
 @color_tokentextarea_input_text : #222222;
 @color_tokentextarea_label_text : rgb(128, 128, 128);
 
 /***************************************************************************
                    Splitview
 ***************************************************************************/
-@color_splitview_spliter_bar : rgb(179, 179, 179);
-@color_splitview_spliter_bar_active : rgb(87, 135, 194);
+@color_splitview_spliter_bar : rgb(52, 55, 57);				/* W131 */
+@color_splitview_spliter_bar_active : rgb(59, 115, 182);		/* W132 */
+@color_splitview_spliter_border : rgb(58, 62, 67);
diff --git a/src/themes/tizen/tizen-white/images/00_button_radio.png b/src/themes/tizen/tizen-white/images/00_button_radio.png
index 83a1a54e..a916a262 100644..100755
--- a/src/themes/tizen/tizen-white/images/00_button_radio.png
+++ b/src/themes/tizen/tizen-white/images/00_button_radio.png
diff --git a/src/themes/tizen/tizen-white/images/00_button_radio_press.png b/src/themes/tizen/tizen-white/images/00_button_radio_press.png
new file mode 100755
index 00000000..462d83e6
--- /dev/null
+++ b/src/themes/tizen/tizen-white/images/00_button_radio_press.png
diff --git a/src/themes/tizen/tizen-white/images/00_button_radio_press_bg.png b/src/themes/tizen/tizen-white/images/00_button_radio_press_bg.png
new file mode 100755
index 00000000..e0bae658
--- /dev/null
+++ b/src/themes/tizen/tizen-white/images/00_button_radio_press_bg.png
diff --git a/src/themes/tizen/tizen-white/images/00_button_radio_select.png b/src/themes/tizen/tizen-white/images/00_button_radio_select.png
index 8b8ad9da..e76b7a75 100644..100755
--- a/src/themes/tizen/tizen-white/images/00_button_radio_select.png
+++ b/src/themes/tizen/tizen-white/images/00_button_radio_select.png
diff --git a/src/themes/tizen/tizen-white/images/00_check_bg.png b/src/themes/tizen/tizen-white/images/00_check_bg.png
index 1f60e1bf..bb08643c 100644..100755
--- a/src/themes/tizen/tizen-white/images/00_check_bg.png
+++ b/src/themes/tizen/tizen-white/images/00_check_bg.png
diff --git a/src/themes/tizen/tizen-white/images/00_check_bg_press.png b/src/themes/tizen/tizen-white/images/00_check_bg_press.png
index bf665afd..66568104 100644..100755
--- a/src/themes/tizen/tizen-white/images/00_check_bg_press.png
+++ b/src/themes/tizen/tizen-white/images/00_check_bg_press.png
diff --git a/src/themes/tizen/tizen-black/images/00_contacts_button_header.png b/src/themes/tizen/tizen-white/images/00_check_press.png
index 20462252..9065f672 100644..100755
--- a/src/themes/tizen/tizen-black/images/00_contacts_button_header.png
+++ b/src/themes/tizen/tizen-white/images/00_check_press.png
diff --git a/src/themes/tizen/tizen-white/images/00_contacts_button_header_press.png b/src/themes/tizen/tizen-white/images/00_contacts_button_header_press.png
deleted file mode 100644
index 5c814b0f..00000000
--- a/src/themes/tizen/tizen-white/images/00_contacts_button_header_press.png
+++ /dev/null
diff --git a/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png b/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png
index a4a7863d..20e8afcb 100644
--- a/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png
+++ b/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png
diff --git a/src/themes/tizen/tizen-white/images/controls/00_search_icon.png b/src/themes/tizen/tizen-white/images/controls/00_search_icon.png
index 87e8b342..7b06cc01 100644..100755
--- a/src/themes/tizen/tizen-white/images/controls/00_search_icon.png
+++ b/src/themes/tizen/tizen-white/images/controls/00_search_icon.png
diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less
index dbd4071a..13571bd9 100644
--- a/src/themes/tizen/tizen-white/style.less
+++ b/src/themes/tizen/tizen-white/style.less
@@ -33,7 +33,8 @@
 
 @color_list_divider_expand_div : rgba(0, 0, 0, 0.5);
 @color_list_divider_bg : rgba(248, 246, 239, 1);			/* W021L1 */
-@color_list_divider_text : rgba(59, 115, 182, 1);			/* W021L2 */
+@color_list_divider_line : rgba(59, 115, 182, 1);			/* W021L2 */
+@color_list_divider_text : rgba(59, 115, 182, 1);			/* W021L3 */
 
 @color_list_swipe_bg : rgba(237, 235, 228, 1);				/* B0212 */
 
@@ -43,14 +44,16 @@
 
 @color_list_expanded_bg : rgba(220, 218, 211, 1);
 
-@color_list_bubble_sent_text:	rgb(0, 0, 0);
-@color_list_bubble_receive_text:	rgb(255, 255, 255);
+@color_list_editfield : rgba(0, 0, 0, 1);				/* F011L1 */
+
+@color_list_bubble_sent_text:	rgb(0, 0, 0);				/* W051 */
+@color_list_bubble_receive_text:	rgb(0, 0, 0);			/* W051 */
 @color_list_bubble_sos_text:	rgb(233, 73, 73);
 @color_list_bubble_date_text:	rgb(104, 104, 104);
 @color_list_bubble_date_bg:		rgba(225, 225, 225, 0);
-@color_list_bubble_time_sent_text:	rgb(57, 166, 215);
-@color_list_bubble_time_receive_text:	rgb(211, 0, 0);
-@color_list_bubble_time_sos_text:	rgb(211, 0, 0);
+@color_list_bubble_time_sent_text:	rgb(139, 139, 139);		/* F011L16 */
+@color_list_bubble_time_receive_text:	rgb(139, 139, 139);	/* F011L17 */
+@color_list_bubble_time_sos_text:	rgb(233, 73, 73);		/* F011L15 */
 @color_list_bubble_name_text:	rgb(139, 139, 139);
 @color_list_bubble_help_text:	rgb(154, 154, 154);
 @color_list_bubble_link_text:	rgb(34, 129, 157);
@@ -99,8 +102,8 @@
 @color_button_EditText:         rgb(249, 249, 249);
 @color_button_EditTextPress:    rgb(61, 61, 61);
 
-@color_button_text_normal:      rgb(58, 58, 58);
-@color_button_text_press:       rgb(248, 246, 239);
+@color_button_text_normal:      rgb(58, 58, 58);			/* F031L1 */
+@color_button_text_press:       rgb(255, 255, 255);			/* F031L1P */
 @color_button_text_white:       rgb(249, 249, 249);
 
 @color_button_normal:           rgb(235, 232, 227);
@@ -162,7 +165,7 @@
         font-weight: normal;
         font-size: 1.0rem;
         font-style:normal;
-        color: @color_button_text_black;
+        color: @color_button_text_normal;
 }
 
 .LESSbutton_hover_style{
@@ -184,13 +187,13 @@
                         contextual popup
 ***************************************************************************/
 @color_ctxpopup_text:                   rgb(255, 255, 255);
-@color_ctxpopup_background:             rgb(68, 68, 68);
+@color_ctxpopup_background:             rgb(68, 68, 68);	/* B061L4 : Contextual bg */
 @color_ctxpopup_border_left:            rgb(45, 45, 45);
 @color_ctxpopup_border_right:           rgb(91, 91, 91);
 @color_ctxpopup_border_top:             rgb(91, 91, 91);
 @color_ctxpopup_border_bottom:          rgb(45, 45, 45);
 
-@color_ctxbutton_press:            rgb(59, 115, 182);
+@color_ctxbutton_press:            rgb(42, 137, 194);	/* B044 : Contextual effect */
 
 @color_ctxpopup_timepicker_text:        rgba( 255, 255, 255, 0.7 );
 @color_ctxpopup_timepicker_text_focus:  rgba( 255, 255, 255, 1 );
@@ -202,11 +205,12 @@
 @color_scrollbar: 		rgb(198, 196, 190);
 @color_scrollview_indicator_start:      rgb(255,255,255);
 @color_scrollview_indicator_end:        rgb(128,128,128);
+@color_scrollbar_thumb_shadow:		rgba(0, 0, 0, 50);
 
 /***************************************************************************
                    Date Time picker
 ***************************************************************************/
-@color_timepicker_selector_color:	rgb(59,115,182);
+@color_timepicker_selector_color:	rgb(87, 135, 194);	/* W0811 : Picker bg */
 @font_size_datetime_main_text:              22 * @unit_base;
 @font_size_datetime_sub_text:               16 * @unit_base;
 
@@ -221,6 +225,7 @@
 ***************************************************************************/
 @color_popup_center_progressbar_title:	rgba(153, 153, 153, 1);
 @color_popup_title_bg:		rgba(80, 147, 182, 255);	/* popup_title_bg.png */
+@color_popup_title_text:		rgba(59, 115, 182, 1);		/* B063L9 : Basic Style_title */
 
 @color_popup_button_bg:		rgba(248, 246, 239, 1);
 @color_popup_font: rgba(248, 246, 239, 1); /* maybe not use only popupwindow*/
@@ -285,7 +290,7 @@
 /***************************************************************************
                     Smallpopup
 ***************************************************************************/
-@color_smallpopup_bg:			rgb(68, 68, 68);
+@color_smallpopup_bg:			-webkit-linear-gradient(top, @color_bg 0%, rgb(153, 153, 153) 18%, rgb(68, 68, 68) 20%, rgb(68, 68, 68) 100%);
 @color_smallpopup_text:			rgb(255, 255, 255);
 
 /***************************************************************************
@@ -306,7 +311,7 @@
 @color_progress_border:			rgb(163, 160, 158);
 @color_progress_value0:			rgb(54, 119, 195);
 @color_progress_value1:			rgb(150, 184, 224);
-@color_progress_shadow:			rgb(0, 0, 0);
+@color_progress_shadow:			rgb(104, 102, 101);
 
 
 /***************************************************************************
@@ -350,13 +355,14 @@
                    tokentextarea
 ***************************************************************************/
 @color_tokentextarea_block_text : rgb(255, 255, 255);
-@color_tokentextarea_block_bg : rgb(95, 138, 189);
-@color_tokentextarea_press_bg : rgb(54, 89, 132);
+@color_tokentextarea_block_bg : rgb(118, 157, 204);	/* W0711 : Contact button bg normal */
+@color_tokentextarea_press_bg : rgb(64, 147, 247);	/* W0713 : Contact button bg press */
 @color_tokentextarea_input_text : #222222;
 @color_tokentextarea_label_text : rgb(102, 102, 102);
 
 /***************************************************************************
                    Splitview
 ***************************************************************************/
-@color_splitview_spliter_bar : rgb(179, 179, 179);
-@color_splitview_spliter_bar_active : rgb(87, 135, 194);
+@color_splitview_spliter_bar : rgb(149, 149, 149);				/* W131 */
+@color_splitview_spliter_bar_active : rgb(87, 135, 194);		/* W132 */
+@color_splitview_spliter_border : rgb(128, 128, 128);