11 files changed, 116 insertions, 24 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 2e9253928e..5176ca87df 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -62,12 +62,12 @@
 .rtl ul.linklist li {
 	float: right;
 	margin-right: 0;
-	margin-left: 5px;
+	margin-left: 7px;
 }
 
 .rtl ul.linklist li.rightside, .rtl p.rightside {
 	float: left;
-	margin-right: 5px;
+	margin-right: 7px;
 	margin-left: 0;
 	text-align: left;
 }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 4b7532ab8a..2d1401cc31 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -106,7 +106,7 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) {
 ----------------------------------------*/
 
 ul.navlinks {
-	border-bottom-color: #FFFFFF;
+	border-top-color: #FFFFFF;
 }
 
 /* Table styles
@@ -369,6 +369,10 @@ a.arrow-right:hover {
 	color: #368AD2;
 }
 
+a.icon-dropdown:after {
+	background-image: url("./images/icon_dropdown.png");
+}
+
 
 /*
 --------------------------------------------------------------
@@ -696,22 +700,34 @@ Colours and backgrounds for buttons.css
 ---------------------------------------- */
 .icon-faq						{ background-image: url("./images/icon_faq.gif"); }
 .icon-members					{ background-image: url("./images/icon_members.gif"); }
+.icon-team						{ background-image: url("./images/icon_team.gif"); }
+.icon-cookies					{ background-image: url("./images/icon_cookies.gif"); }
 .icon-home						{ background-image: url("./images/icon_home.gif"); }
+.icon-acp						{ background-image: url("./images/icon_acp.gif"); }
+.icon-mcp						{ background-image: url("./images/icon_mcp.gif"); }
 .icon-ucp						{ background-image: url("./images/icon_ucp.gif"); }
+.icon-profile					{ background-image: url("./images/icon_profile.gif"); }
 .icon-register					{ background-image: url("./images/icon_register.gif"); }
+.icon-quick-links				{ background-image: url("./images/icon_quick_links.gif"); }
 .icon-logout					{ background-image: url("./images/icon_logout.gif"); }
 .icon-bookmark					{ background-image: url("./images/icon_bookmark.gif"); }
 .icon-bump						{ background-image: url("./images/icon_bump.gif"); }
 .icon-subscribe					{ background-image: url("./images/icon_subscribe.gif"); }
 .icon-unsubscribe				{ background-image: url("./images/icon_unsubscribe.gif"); }
 .icon-pages						{ background-image: url("./images/icon_pages.gif"); }
-.icon-search, .responsive-search a	{ background-image: url("./images/icon_search.gif"); }
 .icon-notification				{ background-image: url("./images/icon_notification.gif"); }
 .icon-pm						{ background-image: url("./images/icon_pm.gif"); }
 .icon-download					{ background-image: url("./images/icon_download.gif"); }
 .icon-mark						{ background-image: url("./images/icon_mark.gif"); }
 .icon-sendemail					{ background-image: url("./images/icon_sendemail.gif"); }
 .icon-print						{ background-image: url("./images/icon_print.gif"); }
+.icon-search, .responsive-search a	{ background-image: url("./images/icon_search.gif"); }
+.icon-search-advanced			{ background-image: url("./images/icon_search_adv.gif"); }
+.icon-search-self				{ background-image: url("./images/icon_topic_latest.gif"); }
+.icon-search-unanswered			{ background-image: url("./images/icon_post_target.gif"); }
+.icon-search-unread				{ background-image: url("./images/subforum_unread.gif"); }
+.icon-search-new				{ background-image: url("./images/subforum_unread.gif"); }
+.icon-search-active				{ background-image: url("./images/subforum_read.gif"); }
 
 /* Profile & navigation icons */
 .contact-icon													{ background-image: url("./images/icons_contact.png"); }
@@ -1184,6 +1200,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
 	border-color: #DCDCDC;
 }
 
+.dropdown li.separator {
+	border-color: #DCDCDC;
+}
+
 /* Notifications
 ---------------------------------------- */
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a52f5e494d..67add8b90e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -261,7 +261,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 }
 
 .navbar {
-	padding: 5px 10px 5px 10px;
+	padding: 3px 10px;
 	border-radius: 7px;
 }
 
@@ -307,6 +307,10 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 
 /* Horizontal lists
 ----------------------------------------*/
+.navbar ul.linklist {
+	padding: 2px 0;
+}
+
 ul.linklist {
 	display: block;
 	margin: 0;
@@ -327,7 +331,7 @@ ul.linklist li {
 	list-style-type: none;
 	float: left;
 	width: auto;
-	margin-right: 5px;
+	margin-right: 7px;
 	font-size: 1.1em;
 	line-height: 2.2em;
 	padding-top: 1px;
@@ -336,15 +340,12 @@ ul.linklist li {
 ul.linklist li.rightside, p.rightside {
 	float: right;
 	margin-right: 0;
-	margin-left: 5px;
+	margin-left: 7px;
 	text-align: right;
 }
 
 ul.navlinks {
-	padding-bottom: 1px;
-	margin-bottom: 1px;
-	border-bottom: 1px solid transparent;
-	font-weight: bold;
+	border-top: 1px solid transparent;
 }
 
 ul.leftside {
@@ -372,7 +373,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link {
 	font-size: 16px;
 	position: relative;
 	width: 16px;
-	line-height: 16.5px;
+	line-height: 20px;
 	text-decoration: none;
 }
 
@@ -403,10 +404,6 @@ li.responsive-menu.dropdown-left .dropdown {
 	right: -6px;
 }
 
-li.responsive-menu .dropdown .dropdown-contents {
-	padding: 0 5px;
-}
-
 ul.linklist .dropdown-down .dropdown {
 	top: 22px;
 }
@@ -417,10 +414,10 @@ ul.linklist .dropdown-up .dropdown {
 
 ul.linklist .dropdown li {
 	clear: both;
+	margin: 0;
+	padding: 4px 4px 4px 0;
 }
 
-
-
 /* Bulletin icons for list items
 ----------------------------------------*/
 ul.linklist.bulletin li:before {
@@ -444,9 +441,13 @@ ul.linklist.bulletin li.no-bulletin:before {
 }
 
 /* Avatar in overall_header.html */
+.header-avatar:hover {
+	text-decoration: none;
+}
+
 .header-avatar img {
 	margin-bottom: 2px;
-	max-height: 25px;
+	max-height: 20px;
 	vertical-align: middle;
 	width: auto;
 }
@@ -556,14 +557,14 @@ ul.linklist.bulletin li.no-bulletin:before {
 	padding: 5px;
 	position: relative;
 	min-width: 40px;
-	max-height: 200px;
+	max-height: 300px;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
 .dropdown li {
-	border-bottom: 1px dotted transparent;
+	border-top: 1px dotted transparent;
 	float: none !important;
 	line-height: normal !important;
 	font-size: 1em !important;
@@ -575,8 +576,8 @@ ul.linklist.bulletin li.no-bulletin:before {
 	text-align: left;
 }
 
-.dropdown li:last-child, .dropdown li li {
-	border-bottom: 0;
+.dropdown li:first-child, .dropdown li.separator + li, .dropdown li li {
+	border-top: 0;
 }
 
 .dropdown li li:first-child {
@@ -600,10 +601,33 @@ ul.linklist.bulletin li.no-bulletin:before {
 	display: none !important;
 }
 
+.dropdown li.separator {
+	border-top: 1px solid transparent;
+}
+
+.dropdown li.separator, ul.linklist .dropdown li.separator {
+	margin: 3px 0;
+	padding: 0;
+}
+
+.dropdown li.separator:first-child, .dropdown li.separator:last-child {
+	display: none !important;
+}
+
+.dropdown .clone + li.separator {
+	display: none;
+}
+
+.responsive .dropdown .clone + li.separator {
+	display: inherit;
+}
+
+
 /* Responsive breadcrumbs
 ----------------------------------------*/
 .breadcrumbs .crumb {
 	float: left;
+	font-weight: bold;
 	word-wrap: normal;
 }
 
@@ -1233,6 +1257,30 @@ form > p.post-notice strong {
 	display: block;
 }
 
+/* Main navigation specific list items
+----------------------------------------*/
+
+#quick-links {
+	margin: 0 7px 0 0;
+}
+
+#quick-links a.responsive-menu-link {
+	display: block;
+	font-size: inherit;
+	line-height: inherit;
+	margin: 0;
+	width: auto;
+}
+
+#quick-links a.responsive-menu-link:before {
+	font-size: 16px;
+	line-height: 16.5px;
+}
+
+.compact #quick-links a.responsive-menu-link {
+	font-size: 0;
+}
+
 .compact .icon-notification > a > span, .compact .icon-pm > a > span {
 	display: none;
 }
@@ -1252,3 +1300,11 @@ form > p.post-notice strong {
 .dropdown-page-jump input.tiny {
 	width: 50px;
 }
+
+.dropdown .clone {
+	display: none;
+}
+
+.responsive .dropdown .clone {
+	display: inherit;
+}
diff --git a/phpBB/styles/prosilver/theme/images/icon_acp.gif b/phpBB/styles/prosilver/theme/images/icon_acp.gif
new file mode 100644
index 0000000000..5d3efb45a9
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_acp.gif
diff --git a/phpBB/styles/prosilver/theme/images/icon_cookies.gif b/phpBB/styles/prosilver/theme/images/icon_cookies.gif
new file mode 100644
index 0000000000..f4d45281f6
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_cookies.gif
diff --git a/phpBB/styles/prosilver/theme/images/icon_dropdown.png b/phpBB/styles/prosilver/theme/images/icon_dropdown.png
new file mode 100644
index 0000000000..d471eef450
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_dropdown.png
diff --git a/phpBB/styles/prosilver/theme/images/icon_mcp.gif b/phpBB/styles/prosilver/theme/images/icon_mcp.gif
new file mode 100644
index 0000000000..ec243ef821
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_mcp.gif
diff --git a/phpBB/styles/prosilver/theme/images/icon_profile.gif b/phpBB/styles/prosilver/theme/images/icon_profile.gif
new file mode 100644
index 0000000000..a0ec098460
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_profile.gif
diff --git a/phpBB/styles/prosilver/theme/images/icon_team.gif b/phpBB/styles/prosilver/theme/images/icon_team.gif
new file mode 100644
index 0000000000..613158257b
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_team.gif
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 89639dde02..0ed0a5d139 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -75,6 +75,22 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	width: 40px;
 }
 
+/* Dropdown links (inline) */
+a.icon-dropdown:after {
+	background-position: 0 0;
+	background-repeat: no-repeat;
+	content: '';
+	display: inline-block;
+	float: right;
+	height: 8px;
+	width: 11px;
+	margin: 9px 0 0 2px;
+}
+
+a.icon-dropdown:hover:after, .dropdown-visible a.icon-dropdown:after {
+	background-position: 0 -22px;
+}
+
 /* Links for forum/topic lists */
 a.forumtitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index e27a2292b3..cea7656d7f 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -73,7 +73,7 @@ body {
 .responsive-search a {
 	display: block;
 	width: 16px;
-	height: 18px;
+	height: 22px;
 	text-indent: 99px;
 	overflow: hidden;
 	background-position: 50% 50%;