diff --git a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
index 01b6b373..0de3f8a4 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
+++ b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
@@ -63,6 +63,15 @@
         <!--<li data-pwTool="eraser">Eraser</li>-->
         <li data-pwCommand="imageClear">Clear image</li>
         <li data-pwCommand="imageSave">Save image</li>
+
+        <li class="paintweb_strokeFillStyles">
+          <p class="paintweb_opt_fillStyle">Fill
+            <span data-pwColorInput="fillStyle">&#160;</span>
+          </p>
+          <p class="paintweb_opt_strokeStyle">Stroke
+            <span data-pwColorInput="strokeStyle">&#160;</span>
+          </p>
+        </li>
       </ul>
 
       <div class="paintweb_strokeFillStyles">
diff --git a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css
index 366080a4..f9667eb9 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css
+++ b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css
@@ -144,6 +144,9 @@
   background: #fff;
   color: #000
 }
+.paintweb_main_main{
+  display: flex;
+}
 
 .paintweb_tools {
   border-left: 1px solid #d6d6d6;
@@ -151,8 +154,6 @@
   list-style: none;
   margin: 0;
   padding: 0;
-  /*width: 416px;*/
-  width:100%;
   display: flex;
   border:0px solid blue;
 }
@@ -195,6 +196,7 @@
   white-space: nowrap
 }
 
+.paintweb_strokeFillStyles:hover, .paintweb_strokeFillStyles:focus,
 .paintweb_tool:hover, .paintweb_tool:focus,
 .paintweb_command:hover, .paintweb_command:focus,
 .paintweb_icon:hover, .paintweb_icon:focus { background: #fff }
@@ -735,40 +737,34 @@
 .paintweb_strokeFillStyles {
   /*background: url("images/toolbar-colors.png") no-repeat;*/
   /*font-size: 0.9em;*/
-  height: 67px;
+
   /*left: 297px;*/
-  right: 337px;
-  position: absolute;
-  top: -8px;
-  width: 69px
+  /*right: 337px;
+  height: 67px;
+  position: absolute;*/
+
+  width: 40px
 }
 
 .paintweb_opt_fillStyle {
-  height: 51px;
-  margin: 2px 0 0 13px;
+  margin: 0 0 0 4px;
   padding: 0
 }
 
 .paintweb_opt_strokeStyle {
-  margin: 0;
-  padding: 0 11px 0 0;
+  margin: -10px 0 0 14px;
+  padding: 0 0 0 0;
   text-align: right
 }
 
 .paintweb_fillStyle {
   height: 18px;
-  left: 23px;
-  position: absolute;
-  top: 20px;
   width: 18px;
 }
 
 .paintweb_strokeStyle {
-  bottom: 18px;
   height: 18px;
-  position: absolute;
-  right: 15px;
-  width: 18px
+  width: 18px;
 }
 
 .paintweb_floatingPanel_colormixer .paintweb_tabsList {