diff --git a/res.qrc b/res.qrc
index ab8edf03e..941274405 100644
--- a/res.qrc
+++ b/res.qrc
@@ -44,8 +44,6 @@
img/taskbar/light/taskbar_event.svg
img/transfer.svg
ui/fileTransferWidget/fileDone.svg
- ui/callButton/callButton.css
- ui/callButton/callButton.svg
ui/chatArea/chatArea.css
ui/chatArea/chatHead.css
ui/chatArea/innerStyle.css
@@ -53,6 +51,11 @@
ui/chatArea/scrollBarDownArrow.svg
ui/chatArea/scrollBarLeftArrow.svg
ui/chatArea/scrollBarRightArrow.svg
+ ui/chatFormHeader/buttons.css
+ ui/chatFormHeader/callButton.svg
+ ui/chatFormHeader/micButton.svg
+ ui/chatFormHeader/videoButton.svg
+ ui/chatFormHeader/volButton.svg
ui/emoteButton/emoteButton.css
ui/emoteButton/emoteButton.svg
ui/emoticonWidget/dot_page.svg
@@ -65,8 +68,6 @@
ui/screenshotButton/screenshotButton.svg
ui/fileTransferWidget/fileTransferWidget.css
ui/friendList/friendList.css
- ui/micButton/micButton.css
- ui/micButton/micButton.svg
ui/msgEdit/msgEdit.css
ui/sendButton/sendButton.css
ui/sendButton/sendButton.svg
@@ -74,10 +75,6 @@
ui/settings/mainHead.css
ui/statusButton/statusButton.css
ui/statusButton/menu_indicator.svg
- ui/videoButton/videoButton.css
- ui/videoButton/videoButton.svg
- ui/volButton/volButton.css
- ui/volButton/volButton.svg
ui/window/general.css
ui/window/statusPanel.css
ui/window/window.css
diff --git a/ui/callButton/callButton.css b/ui/callButton/callButton.css
deleted file mode 100644
index f09f4b74d..000000000
--- a/ui/callButton/callButton.css
+++ /dev/null
@@ -1,63 +0,0 @@
-QAbstractButton
-{
- border-radius: 5px;
- border: none;
- background-image: url(":/ui/callButton/callButton.svg");
- background-repeat: none;
- background-position: center;
-}
-
-QAbstractButton:disabled
-{
- background-color: #919191;
-}
-
-QAbstractButton:focus
-{
- outline: none;
-}
-
-QAbstractButton#green
-{
- background-color: #6bc260;
-}
-
-QAbstractButton#green:hover
-{
- background-color: #79c76f;
-}
-
-QAbstractButton#green:pressed
-{
- background-color: #51b244;
-}
-
-QAbstractButton#red
-{
- background-color: #c84e4e;
-}
-
-QAbstractButton#red:hover
-{
- background-color: #e87474;
-}
-
-QAbstractButton#red:pressed
-{
- background-color: #df3b3b;
-}
-
-QAbstractButton#yellow
-{
- background-color: #e6e465;
-}
-
-QAbstractButton#yellow:hover
-{
- background-color: #e8e774;
-}
-
-QAbstractButton#yellow:pressed
-{
- background-color: #e3e155;
-}
diff --git a/ui/chatFormHeader/buttons.css b/ui/chatFormHeader/buttons.css
new file mode 100644
index 000000000..e0562dfe6
--- /dev/null
+++ b/ui/chatFormHeader/buttons.css
@@ -0,0 +1,82 @@
+QAbstractButton#volButton
+{
+ image: url(":/ui/chatFormHeader/volButton.svg");
+}
+
+QAbstractButton#micButton
+{
+ image: url(":/ui/chatFormHeader/micButton.svg");
+}
+
+QAbstractButton#videoButton
+{
+ background-image: url(":/ui/chatFormHeader/videoButton.svg");
+}
+
+QAbstractButton#callButton
+{
+ background-image: url(":/ui/chatFormHeader/callButton.svg");
+}
+
+QAbstractButton
+{
+ background-repeat: none;
+ background-position: center;
+ border: none;
+ border-radius: 5px;
+}
+
+QAbstractButton:disabled
+{
+ background-color: #919191;
+}
+
+QAbstractButton:focus
+{
+ outline: none;
+}
+
+QAbstractButton[state="green"]
+{
+ background-color: #6bc260;
+}
+
+QAbstractButton[state="green"]:hover
+{
+ background-color: #79c76f;
+}
+
+QAbstractButton[state="green"]:pressed
+{
+ background-color: #51b244;
+}
+
+QAbstractButton[state="red"]
+{
+ background-color: #c84e4e;
+}
+
+QAbstractButton[state="red"]:hover
+{
+ background-color: #e87474;
+}
+
+QAbstractButton[state="red"]:pressed
+{
+ background-color: #df3b3b;
+}
+
+QAbstractButton[state="yellow"]
+{
+ background-color: #e6e465;
+}
+
+QAbstractButton[state="yellow"]:hover
+{
+ background-color: #e8e774;
+}
+
+QAbstractButton[state="yellow"]:pressed
+{
+ background-color: #e3e155;
+}
diff --git a/ui/callButton/callButton.svg b/ui/chatFormHeader/callButton.svg
similarity index 100%
rename from ui/callButton/callButton.svg
rename to ui/chatFormHeader/callButton.svg
diff --git a/ui/micButton/micButton.svg b/ui/chatFormHeader/micButton.svg
similarity index 100%
rename from ui/micButton/micButton.svg
rename to ui/chatFormHeader/micButton.svg
diff --git a/ui/videoButton/videoButton.svg b/ui/chatFormHeader/videoButton.svg
similarity index 100%
rename from ui/videoButton/videoButton.svg
rename to ui/chatFormHeader/videoButton.svg
diff --git a/ui/volButton/volButton.svg b/ui/chatFormHeader/volButton.svg
similarity index 100%
rename from ui/volButton/volButton.svg
rename to ui/chatFormHeader/volButton.svg
diff --git a/ui/micButton/micButton.css b/ui/micButton/micButton.css
deleted file mode 100644
index 4490e1587..000000000
--- a/ui/micButton/micButton.css
+++ /dev/null
@@ -1,67 +0,0 @@
-QToolButton
-{
- image: url(":/ui/micButton/micButton.svg");
-}
-
-QAbstractButton
-{
- border-radius: 5px;
- border: none;
- background-repeat: none;
- background-position: center;
-}
-
-QAbstractButton:disabled
-{
- background-color: #919191;
-}
-
-QAbstractButton:focus
-{
- outline: none;
-}
-
-QAbstractButton#green
-{
- background-color: #6bc260;
-}
-
-QAbstractButton#green:hover
-{
- background-color: #79c76f;
-}
-
-QAbstractButton#green:pressed
-{
- background-color: #51b244;
-}
-
-QAbstractButton#red
-{
- background-color: #c84e4e;
-}
-
-QAbstractButton#red:hover
-{
- background-color: #e87474;
-}
-
-QAbstractButton#red:pressed
-{
- background-color: #df3b3b;
-}
-
-QAbstractButton#yellow
-{
- background-color: #e6e465;
-}
-
-QAbstractButton#yellow:hover
-{
- background-color: #e8e774;
-}
-
-QAbstractButton#yellow:pressed
-{
- background-color: #e3e155;
-}
diff --git a/ui/videoButton/videoButton.css b/ui/videoButton/videoButton.css
deleted file mode 100644
index 350b0a53a..000000000
--- a/ui/videoButton/videoButton.css
+++ /dev/null
@@ -1,63 +0,0 @@
-QAbstractButton
-{
- background-image: url(":/ui/videoButton/videoButton.svg");
- background-repeat: none;
- background-position: center;
- border: none;
- border-radius: 5px;
-}
-
-QAbstractButton:disabled
-{
- background-color: #919191;
-}
-
-QAbstractButton:focus
-{
- outline: none;
-}
-
-QAbstractButton#green
-{
- background-color: #6bc260;
-}
-
-QAbstractButton#green:hover
-{
- background-color: #79c76f;
-}
-
-QAbstractButton#green:pressed
-{
- background-color: #51b244;
-}
-
-QAbstractButton#red
-{
- background-color: #c84e4e;
-}
-
-QAbstractButton#red:hover
-{
- background-color: #e87474;
-}
-
-QAbstractButton#red:pressed
-{
- background-color: #df3b3b;
-}
-
-QAbstractButton#yellow
-{
- background-color: #e6e465;
-}
-
-QAbstractButton#yellow:hover
-{
- background-color: #e8e774;
-}
-
-QAbstractButton#yellow:pressed
-{
- background-color: #e3e155;
-}
diff --git a/ui/volButton/volButton.css b/ui/volButton/volButton.css
deleted file mode 100644
index bc64069bc..000000000
--- a/ui/volButton/volButton.css
+++ /dev/null
@@ -1,67 +0,0 @@
-QToolButton
-{
- image: url(":/ui/volButton/volButton.svg");
-}
-
-QAbstractButton
-{
- border-radius: 5px;
- border: none;
- background-repeat: none;
- background-position: center;
-}
-
-QAbstractButton:disabled
-{
- background-color: #919191;
-}
-
-QAbstractButton:focus
-{
- outline: none;
-}
-
-QAbstractButton#green
-{
- background-color: #6bc260;
-}
-
-QAbstractButton#green:hover
-{
- background-color: #79c76f;
-}
-
-QAbstractButton#green:pressed
-{
- background-color: #51b244;
-}
-
-QAbstractButton#red
-{
- background-color: #c84e4e;
-}
-
-QAbstractButton#red:hover
-{
- background-color: #e87474;
-}
-
-QAbstractButton#red:pressed
-{
- background-color: #df3b3b;
-}
-
-QAbstractButton#yellow
-{
- background-color: #e6e465;
-}
-
-QAbstractButton#yellow:hover
-{
- background-color: #e8e774;
-}
-
-QAbstractButton#yellow:pressed
-{
- background-color: #e3e155;
-}