diff --git a/src/server/SwingClientGame.java b/src/server/SwingClientGame.java
index 9da4edb..12223e8 100644
--- a/src/server/SwingClientGame.java
+++ b/src/server/SwingClientGame.java
@@ -5,11 +5,13 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
+import java.awt.Image;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.List;
 
 import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -43,6 +45,10 @@
 
 	Font font;
 	final static Color BACKGROUND = Color.black;
+	private static final ImageIcon HINT_0 = new ImageIcon(new ImageIcon("hint_0.png").getImage().getScaledInstance(40, 40, Image.SCALE_SMOOTH));
+	private static final ImageIcon HINT_1 = new ImageIcon(new ImageIcon("hint_1.png").getImage().getScaledInstance(40, 40, Image.SCALE_SMOOTH));
+	private static final ImageIcon FLASH_0 = new ImageIcon(new ImageIcon("flash_0.png").getImage().getScaledInstance(40, 40, Image.SCALE_SMOOTH));
+	private static final ImageIcon FLASH_1 = new ImageIcon(new ImageIcon("flash_1.png").getImage().getScaledInstance(40, 40, Image.SCALE_SMOOTH));
 
 	public static void main(String[] args){
 		new SwingClientGame();
@@ -148,19 +154,19 @@
 			layoutConstr.gridwidth = 1;
 			int index = (nrOfPlayers == 2) ? 1 : 2;
 			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
-			JPanel playerPanel = ((SwingPlayer) players[index]).getPlayerUi();
+			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
 			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 		} else {
 			layoutConstr.weightx = 0.3;
 			layoutConstr.gridwidth = 1;
 			//mainFrame.add(((SwingPlayer) players[3]).getContainer(), layoutConstr);
-			JPanel playerPanel = ((SwingPlayer) players[3]).getPlayerUi();
+			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(3)]).getPlayerUi();
 			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 			layoutConstr.gridx = 2;
 			//mainFrame.add(((SwingPlayer) players[2]).getContainer(), layoutConstr);
-			playerPanel = ((SwingPlayer) players[2]).getPlayerUi();
+			playerPanel = ((SwingPlayer) players[getPlayersSightId(2)]).getPlayerUi();
 			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 		}
@@ -182,7 +188,7 @@
 		} else {
 			int index = (nrOfPlayers == 4) ? 3 : 4;
 			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
-			JPanel playerPanel = ((SwingPlayer) players[index]).getPlayerUi();
+			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
 			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
 		}
@@ -200,7 +206,7 @@
 			mainFrame.add(new JPanel(), layoutConstr);
 		} else {
 			//mainFrame.add(((SwingPlayer) players[1]).getContainer(), layoutConstr);
-			JPanel playerPanel = ((SwingPlayer) players[1]).getPlayerUi();
+			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(1)]).getPlayerUi();
 			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
 		}
@@ -217,7 +223,7 @@
 		layoutConstr.weightx = 0.8;
 		layoutConstr.gridwidth = (nrOfPlayers < 5) ? 1 : 2;
 		//mainFrame.add(((SwingPlayer) players[0]).getContainer(), layoutConstr);
-		JPanel playerPanel = ((SwingPlayer) players[0]).getPlayerUi();
+		JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(0)]).getPlayerUi();
 		mainFrame.add(playerPanel);
 		playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 
@@ -234,7 +240,7 @@
 		hintUI = new JLabel[MAX_HINTS];
 		for(int i=0; i<MAX_HINTS; ++i){
 			JLabel tmp = new JLabel();
-			tmp.setText("1");
+			tmp.setIcon(HINT_1);
 			tmp.setForeground(Color.white);
 			tmp.setName("Hint_" + i);
 			tmp.setFont(font);
@@ -244,7 +250,7 @@
 		flashUI = new JLabel[MAX_FLASHS];
 		for(int i=0;i<MAX_FLASHS; ++i){
 			JLabel tmp = new JLabel();
-			tmp.setText("0");
+			tmp.setIcon(FLASH_0);
 			tmp.setForeground(Color.white);
 			tmp.setName("Flash_" + i);
 			tmp.setFont(font);
@@ -274,16 +280,16 @@
 	protected void updateUI() {
 		Log("hints: " + hints);
 		for(int i=0; i<hints; ++i){
-			hintUI[i].setText("1");
+			hintUI[i].setIcon(HINT_1);
 		}
 		for(int i=hints; i<MAX_HINTS; ++i){
-			hintUI[i].setText("0");
+			hintUI[i].setIcon(HINT_0);
 		}
 		for(int i=0; i<flashs; ++i){
-			flashUI[i].setText("1");
+			flashUI[i].setIcon(FLASH_1);
 		}
 		for(int i=flashs; i<MAX_FLASHS; ++i){
-			flashUI[i].setText("0");
+			flashUI[i].setIcon(FLASH_0);
 		}
 		for(int i=0; i<deck.length; ++i){
 			for(int j=0; j<deck[i].length; ++j){