diff --git a/src/main/resources/es/kauron/jstudy/img/Copy.png b/src/main/resources/es/kauron/jstudy/img/Copy.png
new file mode 100644
index 0000000..140d165
Binary files /dev/null and b/src/main/resources/es/kauron/jstudy/img/Copy.png differ
diff --git a/src/main/resources/es/kauron/jstudy/img/Delete.png b/src/main/resources/es/kauron/jstudy/img/Delete.png
new file mode 100644
index 0000000..873f154
Binary files /dev/null and b/src/main/resources/es/kauron/jstudy/img/Delete.png differ
diff --git a/src/main/resources/es/kauron/jstudy/img/Edit.png b/src/main/resources/es/kauron/jstudy/img/Edit.png
new file mode 100644
index 0000000..a708233
Binary files /dev/null and b/src/main/resources/es/kauron/jstudy/img/Edit.png differ
diff --git a/src/main/resources/es/kauron/jstudy/img/Replace.png b/src/main/resources/es/kauron/jstudy/img/Replace.png
new file mode 100644
index 0000000..387ca4f
Binary files /dev/null and b/src/main/resources/es/kauron/jstudy/img/Replace.png differ
diff --git a/src/main/resources/es/kauron/jstudy/view/table.fxml b/src/main/resources/es/kauron/jstudy/view/table.fxml
index 04c21e0..2f2dc24 100644
--- a/src/main/resources/es/kauron/jstudy/view/table.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/table.fxml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
 
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
 <HBox xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.TableController">
    <children>
-      <TableView fx:id="table" HBox.hgrow="ALWAYS">
+      <TableView fx:id="table" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="400.0" HBox.hgrow="ALWAYS">
         <columns>
           <TableColumn fx:id="questionCol" prefWidth="75.0" text="Question" />
           <TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer" />
@@ -21,13 +19,45 @@
       <VBox spacing="5.0">
          <children>
             <Button defaultButton="true" onAction="#onAddAction" prefWidth="105.0" text="_Add" />
-            <Button fx:id="editButton" onAction="#onEditAction" prefWidth="105.0" text="_Edit" />
-            <Button fx:id="swapButton" layoutX="10.0" layoutY="76.0" onAction="#onSwapAction" prefWidth="105.0" text="S_wap" />
-            <Button fx:id="duplicateButton" layoutX="10.0" layoutY="76.0" onAction="#onDuplicateAction" prefWidth="105.0" text="D_uplicate" />
-            <Button fx:id="deleteButton" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete" />
+            <Button fx:id="editButton" alignment="TOP_LEFT" onAction="#onEditAction" prefWidth="105.0" text="_Edit">
+               <graphic>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../img/Edit.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Button>
+            <Button fx:id="swapButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onSwapAction" prefWidth="105.0" text="S_wap">
+               <graphic>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../img/Replace.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Button>
+            <Button fx:id="duplicateButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onDuplicateAction" prefWidth="105.0" text="D_uplicate">
+               <graphic>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../img/Copy.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Button>
+            <Button fx:id="deleteButton" alignment="TOP_LEFT" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete">
+               <graphic>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../img/Delete.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Button>
             <VBox alignment="BOTTOM_CENTER" spacing="5.0" VBox.vgrow="ALWAYS">
                <children>
-                  <Button fx:id="testSelectionButton" onAction="#onTestSelectionAction" prefWidth="105.0" text="Test _selection" />
+                  <Button fx:id="testSelectionButton" onAction="#onTestSelectionAction" prefWidth="105.0" text="Test _selected" />
                   <Button layoutX="10.0" layoutY="273.0" onAction="#onTestAction" prefWidth="105.0" text="_Test all" />
                </children>
             </VBox>