diff --git a/org.adempiere.server/resources/templates/black/images/img_forum.png b/org.adempiere.server/resources/templates/black/images/img_forum.png
index e6573cb968..78e4747ce6 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_forum.png and b/org.adempiere.server/resources/templates/black/images/img_forum.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_irc.png b/org.adempiere.server/resources/templates/black/images/img_irc.png
index faf9c04c41..c2e38b6ff1 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_irc.png and b/org.adempiere.server/resources/templates/black/images/img_irc.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_locsupport.png b/org.adempiere.server/resources/templates/black/images/img_locsupport.png
index 3a4fec07eb..68a4c050bf 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_locsupport.png and b/org.adempiere.server/resources/templates/black/images/img_locsupport.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_resource.png b/org.adempiere.server/resources/templates/black/images/img_resource.png
index bbd7f180f8..8a37c892d6 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_resource.png and b/org.adempiere.server/resources/templates/black/images/img_resource.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_sendreq.png b/org.adempiere.server/resources/templates/black/images/img_sendreq.png
index 9905e0e5f0..78342bb499 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_sendreq.png and b/org.adempiere.server/resources/templates/black/images/img_sendreq.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_supreq.png b/org.adempiere.server/resources/templates/black/images/img_supreq.png
index 7819852b1e..13d7b598b1 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_supreq.png and b/org.adempiere.server/resources/templates/black/images/img_supreq.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_webstore.png b/org.adempiere.server/resources/templates/black/images/img_webstore.png
index 01baf15342..c429180da8 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_webstore.png and b/org.adempiere.server/resources/templates/black/images/img_webstore.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_webui.png b/org.adempiere.server/resources/templates/black/images/img_webui.png
index 7d1807e9bb..42600d75ec 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_webui.png and b/org.adempiere.server/resources/templates/black/images/img_webui.png differ
diff --git a/org.adempiere.server/resources/templates/black/images/img_wiki.png b/org.adempiere.server/resources/templates/black/images/img_wiki.png
index a036e10ebc..a5bf4eba8c 100644
Binary files a/org.adempiere.server/resources/templates/black/images/img_wiki.png and b/org.adempiere.server/resources/templates/black/images/img_wiki.png differ
diff --git a/org.adempiere.server/resources/templates/black/styles/template.css b/org.adempiere.server/resources/templates/black/styles/template.css
index e798d8cdd3..c1f47d8f10 100644
--- a/org.adempiere.server/resources/templates/black/styles/template.css
+++ b/org.adempiere.server/resources/templates/black/styles/template.css
@@ -73,24 +73,39 @@ div.body{
 	top:262px;
 }
 
+.main-content{
+	position: relative;
+	height: 550px;
+}
+#main-docuBtns {
+  display: flex;
+  justify-content: center;
+}
 #main-docuBtns ul {
   margin:0;
   padding:28px;
-  overflow:hidden;
-  list-style:none;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-content: center;
+  align-items: flex-start;
+  justify-content: flex-start;
+  height: 450px;
+  width: 700px;
 }
 #main-docuBtns ul li {
-  display: inline-block;
+  display: inline-flex;
+  flex-direction: column;
   height:120px;
-  width:120px;
-  padding:18px 0;
+  width:130px;
+  padding: 9px 0;
   text-align:center;
   background-color: #111;
-  margin: 2px;
+  margin: 5px;
 }
 #main-docuBtns ul li > a {
 	width: 100%;
-	height: 95%;
+	flex-grow: 1;
 	display: inline-block;
 }
 #main-docuBtns ul li > a > img {
@@ -102,6 +117,7 @@ div.body{
 	padding-top:2px;
 	padding-bottom:2px;
 	color: #fff;
+	flex-grow: 0;
 }
 #main-requestBtns-btnLogin{
 	overflow: hidden;
@@ -237,23 +253,7 @@ div.body{
  	filter:alpha(opacity=100);
  	opacity: 1;
 }
-.btnDocu-content{
-	position: relative;
-}
 
-.btnResoc-content{
-	position: relative;
-}
-
-.main-content{
-	position: relative;
-	height: 550px;
-}
-#main-rssContent{
-	position: absolute;
-    right: 50px;
-    top: 50px;
-}
 #credits{
 	font-size: 70%;	
 }
@@ -288,52 +288,3 @@ div.body{
 	filter:alpha(opacity=100);
  	opacity: 1;
 }
-
-/** RSS FEED **/
-.labelfield{ 
-	color:gray; 
-	font-size: 50%; }
-.datefield{ 
-	color:gray; 
-	font-size: 80%;}
-#rssfeeds a{ 
-	color: #336699;
-	text-decoration: none;
-	font-weight: bold;
-	font-size: 90%;
-}
-#rssfeeds p{ 
-	margin-bottom: 2px;
-	text-decoration: none;
-	font-size: 90%;
-}
-code{ 
-	color: red;
-}
-#blogoolafeed, #blogoolafeed a { 
-					color:white; 
-				}
-#blogoolafeed a:hover{ 
-				color:#8E7BD3; 
-			}
-#blogoolafeed ul { 
-	margin-left:-15px 
-}
-#rssfeed-wrap:hover {
-	opacity: 0.9;
-	filter:alpha(opacity=90);
-}
-#rssfeed-wrap {
-	font-size: 80%;
-	background-color: #CCCCCC;
-    border-radius: 15px;
-    color: #000000;
-    height: 340px;
-    opacity: 0.3;
-    overflow: scroll;
-    padding: 10px;
-    text-align: left;
-    width: 300px;
-    filter:alpha(opacity=30); 
-    -moz-border-radius: 15px;
-}
\ No newline at end of file
diff --git a/org.adempiere.server/resources/templates/white/images/img_forum.png b/org.adempiere.server/resources/templates/white/images/img_forum.png
index 32152118fb..350140dc2c 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_forum.png and b/org.adempiere.server/resources/templates/white/images/img_forum.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_irc.png b/org.adempiere.server/resources/templates/white/images/img_irc.png
index 1b2c3e44d3..7df6b076af 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_irc.png and b/org.adempiere.server/resources/templates/white/images/img_irc.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_locsupport.png b/org.adempiere.server/resources/templates/white/images/img_locsupport.png
index d92bcb4773..69ba9b779c 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_locsupport.png and b/org.adempiere.server/resources/templates/white/images/img_locsupport.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_resource.png b/org.adempiere.server/resources/templates/white/images/img_resource.png
index 28a2465cb9..36a3cd40d1 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_resource.png and b/org.adempiere.server/resources/templates/white/images/img_resource.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_sendreq.png b/org.adempiere.server/resources/templates/white/images/img_sendreq.png
index e1a126d1fe..f9838a45d0 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_sendreq.png and b/org.adempiere.server/resources/templates/white/images/img_sendreq.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_supreq.png b/org.adempiere.server/resources/templates/white/images/img_supreq.png
index cc1d7699b8..b8cc43260a 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_supreq.png and b/org.adempiere.server/resources/templates/white/images/img_supreq.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_webstore.png b/org.adempiere.server/resources/templates/white/images/img_webstore.png
index d5b8e9b798..ee4f5f6f9c 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_webstore.png and b/org.adempiere.server/resources/templates/white/images/img_webstore.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_webui.png b/org.adempiere.server/resources/templates/white/images/img_webui.png
index 7d1807e9bb..0d2c9e8b40 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_webui.png and b/org.adempiere.server/resources/templates/white/images/img_webui.png differ
diff --git a/org.adempiere.server/resources/templates/white/images/img_wiki.png b/org.adempiere.server/resources/templates/white/images/img_wiki.png
index 4b6305e26d..bf58fa952a 100644
Binary files a/org.adempiere.server/resources/templates/white/images/img_wiki.png and b/org.adempiere.server/resources/templates/white/images/img_wiki.png differ
diff --git a/org.adempiere.server/resources/templates/white/styles/template.css b/org.adempiere.server/resources/templates/white/styles/template.css
index 47f182b099..1e74c33c1f 100644
--- a/org.adempiere.server/resources/templates/white/styles/template.css
+++ b/org.adempiere.server/resources/templates/white/styles/template.css
@@ -67,31 +67,35 @@ div.body{
 	position: relative;
 	height: 550px;
 }
-.btnDocu-content{
-	position: relative;
+#main-docuBtns {
+  display: flex;
+  justify-content: center;
 }
-.btnResoc-content{
-	position: relative;
-}
-
 #main-docuBtns ul {
-  margin:0;
+  margin: 0px auto;
   padding:28px;
-  overflow:hidden;
-  list-style:none;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-content: center;
+  align-items: flex-start;
+  justify-content: flex-start;
+  height: 450px;
+  width: 700px;
 }
 #main-docuBtns ul li {
-  display: inline-block;
-  height:110px;
-  width:120px;
-  padding:18px 0;
+  display: inline-flex;
+  flex-direction: column;
+  height:120px;
+  width:130px;
+  padding: 9px 0;
   text-align:center;
   background-color: #fff;
-  margin: 2px;
+  margin: 5px;
 }
 #main-docuBtns ul li > a {
 	width: 100%;
-	height: 95%;
+	flex-grow: 1;
 	display: inline-block;
 }
 #main-docuBtns ul li > a > img {
@@ -103,6 +107,7 @@ div.body{
 	padding-top:2px;
 	padding-bottom:2px;
 	color: #333;
+	flex-grow: 0;
 }
 #main-requestBtns-btnLogin{
 	overflow: hidden;
@@ -239,11 +244,6 @@ div.body{
  	opacity: 1;
 }
 
-#main-rssContent{
-	height: 320px;
-	padding-left: 25px;
-    padding-top: 25px;
-}
 #credits{
 	font-size: 70%;	
 }
@@ -262,52 +262,9 @@ div.body{
 #socialBar img{
 	filter:alpha(opacity=80);
  	opacity: 0.8;
+ 	filter: invert(40%);
 }
 #socialBar img:hover{
 	filter:alpha(opacity=100);
  	opacity: 1;
 }
-
-/** RSS FEED **/
-.labelfield{ 
-	color:gray; 
-	font-size: 50%; }
-.datefield{ 
-	color:gray; 
-	font-size: 80%;}
-#rssfeeds a{ 
-	color: #336699;
-	text-decoration: none;
-	font-weight: bold;
-	font-size: 90%;
-}
-#rssfeeds p{ 
-	margin-bottom: 2px;
-	text-decoration: none;
-	font-size: 90%;
-}
-code{ 
-	color: red;
-}
-#blogoolafeed, #blogoolafeed a { 
-					color:white; 
-				}
-#blogoolafeed a:hover{ 
-				color:#8E7BD3; 
-			}
-#blogoolafeed ul { 
-	margin-left:-15px 
-}
-#rssfeed-wrap {
-	font-size: 80%;
-	height: 300px;
-    overflow: scroll;
-    text-align: left;
-    width: 280px;
-    background-color:white; 
-    filter:alpha(opacity=90); 
-    opacity:.9;
-    -moz-border-radius: 15px;
-	border-radius: 15px;
-	padding: 10px;
-}
\ No newline at end of file