diff --git a/src/gui/generic/serverguiwrapper.cpp b/src/gui/generic/serverguiwrapper.cpp
index daaedbdb..ba4a58e1 100644
--- a/src/gui/generic/serverguiwrapper.cpp
+++ b/src/gui/generic/serverguiwrapper.cpp
@@ -101,6 +101,10 @@ void ServerGuiWrapper::updateMyButtonsState() {}
 void ServerGuiWrapper::startTimeoutAnimation(int /*playerId*/, int /*timeoutSec*/) {}
 void ServerGuiWrapper::stopTimeoutAnimation(int /*playerId*/) {}
 
+void ServerGuiWrapper::startVoteOnKick(int /*playerId*/, int /*timeoutSec*/) {}
+void ServerGuiWrapper::changeVoteOnKickButtonsState(bool /*showHide*/) {}
+void ServerGuiWrapper::endVoteOnKick() {}
+
 void ServerGuiWrapper::logPlayerActionMsg(string /*playerName*/, int /*action*/, int /*setValue*/) {}
 void ServerGuiWrapper::logNewGameHandMsg(int /*gameID*/, int /*handID*/) {}
 void ServerGuiWrapper::logPlayerWinsMsg(std::string /*playerName*/, int /*pot*/, bool /*main*/) {}
diff --git a/src/gui/generic/serverguiwrapper.h b/src/gui/generic/serverguiwrapper.h
index 06044b75..972a7c19 100644
--- a/src/gui/generic/serverguiwrapper.h
+++ b/src/gui/generic/serverguiwrapper.h
@@ -88,6 +88,10 @@ public:
 	void startTimeoutAnimation(int playerId, int timeoutSec);
 	void stopTimeoutAnimation(int playerId);
 
+	void startVoteOnKick(int playerId, int timeoutSec);
+	void changeVoteOnKickButtonsState(bool showHide);
+	void endVoteOnKick();
+
 	void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
 	void logNewGameHandMsg(int gameID, int handID) ;
 	void logPlayerWinsMsg(std::string playerName, int pot, bool main);
diff --git a/src/gui/guiinterface.h b/src/gui/guiinterface.h
index db225a89..37e7c63b 100644
--- a/src/gui/guiinterface.h
+++ b/src/gui/guiinterface.h
@@ -97,6 +97,10 @@ public:
 	virtual void startTimeoutAnimation(int playerId, int timeoutSec) =0;
 	virtual void stopTimeoutAnimation(int playerId) =0;
 
+	virtual void startVoteOnKick(int playerId, int timeoutSec) =0;
+	virtual void changeVoteOnKickButtonsState(bool showHide) =0;
+	virtual void endVoteOnKick() =0;
+
 	//log.cpp
 	virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
 	virtual void logNewGameHandMsg(int gameID, int HandID) =0;
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 06208e4f..0271148a 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -590,6 +590,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalFlipHolecardsAllIn()), this, SLOT(flipHolecardsAllIn()));
 	connect(this, SIGNAL(signalNextRoundCleanGui()), this, SLOT(nextRoundCleanGui()));
 	connect(this, SIGNAL(signalStartVoteOnKick(int, int)), this, SLOT(startVoteOnKick(int, int)));
+	connect(this, SIGNAL(signalChangeVoteOnKickButtonsState(bool)), this, SLOT(changeVoteOnKickButtonsState(bool)));
 	connect(this, SIGNAL(signalEndVoteOnKick()), this, SLOT(endVoteOnKick()));
 
 }
@@ -3097,6 +3098,8 @@ void gameTableImpl::startVoteOnKick(int playerId, int timeoutSec)
 		tabWidget_Left->insertTab(2, tab_Kick, QString(tr("Kick")));
 	
 	tabWidget_Left->setCurrentIndex(2);
+	pushButton_voteOnKickNo->hide();
+	pushButton_voteOnKickYes->hide();
 
 	PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(playerId));
 	label_kickUser->setText(tr("Do you want to kick <b>%1</b> \nfrom this game?").arg(QString::fromUtf8(info.playerName.c_str())));
@@ -3106,6 +3109,18 @@ void gameTableImpl::startVoteOnKick(int playerId, int timeoutSec)
 	startVoteOnKickTimeout();
 }
 
+void gameTableImpl::changeVoteOnKickButtonsState(bool showHide)
+{
+	if(showHide) {
+		pushButton_voteOnKickNo->show();
+		pushButton_voteOnKickYes->show();
+	}
+	else {
+		pushButton_voteOnKickNo->hide();
+		pushButton_voteOnKickYes->hide();
+	}
+}
+
 void gameTableImpl::endVoteOnKick()
 {
 	stopVoteOnKickTimeout();
diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h
index de18f489..3efc56ed 100755
--- a/src/gui/qt/gametable/gametableimpl.h
+++ b/src/gui/qt/gametable/gametableimpl.h
@@ -120,6 +120,7 @@ signals:
 	void signalNextRoundCleanGui();
 	
 	void signalStartVoteOnKick(int playerId, int timeoutSec);
+	void signalChangeVoteOnKickButtonsState(bool showHide);
 	void signalEndVoteOnKick();
 
 public slots:
@@ -282,6 +283,7 @@ public slots:
 	void closeGameTable();
 
 	void startVoteOnKick(int playerId, int timeoutSec);
+	void changeVoteOnKickButtonsState(bool showHide);
 	void endVoteOnKick();
 	void voteOnKickYes();
 	void voteOnKickNo();
diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index 40bda069..0c395830 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -106,6 +106,7 @@ void GuiWrapper::startTimeoutAnimation(int playerId, int timeoutSec) { myW->sign
 void GuiWrapper::stopTimeoutAnimation(int playerId) { myW->signalStopTimeoutAnimation(playerId); }
 
 void GuiWrapper::startVoteOnKick(int playerId, int timeoutSec) { myW->signalStartVoteOnKick(playerId, timeoutSec); }
+void GuiWrapper::changeVoteOnKickButtonsState(bool showHide) { myW->changeVoteOnKickButtonsState(showHide); }
 void GuiWrapper::endVoteOnKick() { myW->signalEndVoteOnKick(); }
 
 void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), action, setValue); }
diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h
index 8ef22538..7c8be091 100644
--- a/src/gui/qt/guiwrapper.h
+++ b/src/gui/qt/guiwrapper.h
@@ -97,6 +97,7 @@ public:
 	void stopTimeoutAnimation(int playerId);
 
 	void startVoteOnKick(int playerId, int timeoutSec);
+	void changeVoteOnKickButtonsState(bool showHide);
 	void endVoteOnKick();
 
 	void logPlayerActionMsg(std::string playerName, int action, int setValue) ;