diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 94fca3d99..326a95d4a 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -92,26 +92,26 @@ ChatWidget::ChatWidget(QWidget *parent)
 	lastMsgDate = QDate::currentDate();
 
 	//Resize Tool buttons
-	ui->emoteiconButton->setFixedSize(buttonSize);
+	//ui->emoteiconButton->setFixedSize(buttonSize);
 	ui->emoteiconButton->setIconSize(iconSize);
-	ui->stickerButton->setFixedSize(buttonSize);
+	//ui->stickerButton->setFixedSize(buttonSize);
 	ui->stickerButton->setIconSize(iconSize);
-	ui->attachPictureButton->setFixedSize(buttonSize);
+	//ui->attachPictureButton->setFixedSize(buttonSize);
 	ui->attachPictureButton->setIconSize(iconSize);
-	ui->addFileButton->setFixedSize(buttonSize);
+	//ui->addFileButton->setFixedSize(buttonSize);
 	ui->addFileButton->setIconSize(iconSize);
-	ui->pushtoolsButton->setFixedSize(buttonSize);
+	//ui->pushtoolsButton->setFixedSize(buttonSize);
 	ui->pushtoolsButton->setIconSize(iconSize);
-	ui->notifyButton->setFixedSize(buttonSize);
+	//ui->notifyButton->setFixedSize(buttonSize);
 	ui->notifyButton->setIconSize(iconSize);
-	ui->markButton->setFixedSize(buttonSize);
+	//ui->markButton->setFixedSize(buttonSize);
 	ui->markButton->setIconSize(iconSize);
 	ui->leSearch->setFixedHeight(iconHeight);
 	ui->searchBefore->setFixedHeight(iconHeight);
 	ui->searchAfter->setFixedHeight(iconHeight);
-	ui->searchButton->setFixedSize(buttonSize);
+	//ui->searchButton->setFixedSize(buttonSize);
 	ui->searchButton->setIconSize(iconSize);
-	ui->sendButton->setFixedHeight(iconHeight);
+	//ui->sendButton->setFixedHeight(iconHeight);
 	ui->sendButton->setIconSize(iconSize);
 	ui->typingLabel->setMaximumHeight(QFontMetricsF(font()).height()*1.2);
 
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index a7af7c79f..cce118f78 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -332,6 +332,9 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QHBoxLayout" name="toolBarFrameHLayout">
+           <property name="spacing">
+            <number>3</number>
+           </property>
            <property name="leftMargin">
             <number>2</number>
            </property>