diff --git a/src/components/forms/AddEventForm.js b/src/components/forms/AddEventForm.js
index 22b4016f42da3e2bdc3cc8609bf7f41939f83fe0..3be27b0c2f856f1eb3dbddaf8d0f7831e76e7503 100644
--- a/src/components/forms/AddEventForm.js
+++ b/src/components/forms/AddEventForm.js
@@ -31,9 +31,12 @@ class AddEventForm extends Component {
         open={this.state.showModal}
         trigger={
           <Button
+            inverted
+            color='green'
             size='big'
             onClick={() => { this.setState({ showModal: true }); }}
-          >Alkalom hozzĂĄadĂĄsa
+          >
+            <Icon name='plus' />Alkalom hozzĂĄadĂĄsa
           </Button>
         }
       >
diff --git a/src/components/forms/AddNewsForm.js b/src/components/forms/AddNewsForm.js
index 24deefa957e9f4cd515baca9deeb28b26a5a3be7..ec6818289324bc3fb4fee66fdcedf9dd427f1501 100644
--- a/src/components/forms/AddNewsForm.js
+++ b/src/components/forms/AddNewsForm.js
@@ -20,9 +20,12 @@ class AddNewsForm extends Component {
         open={this.state.showModal}
         trigger={
           <Button
+            inverted
+            color='green'
             size='big'
             onClick={() => { this.setState({ showModal: true }); }}
-          >HĂ­r hozzĂĄadĂĄsa
+          >
+            <Icon name='plus' />HĂ­r hozzĂĄadĂĄsa
           </Button>
         }
       >
diff --git a/src/components/forms/EditEventForm.js b/src/components/forms/EditEventForm.js
index fd50446b7a47901767cb89964d956fe6ef19874e..d0ec1fb3367944a2933259b4d68cbd553522d6a8 100644
--- a/src/components/forms/EditEventForm.js
+++ b/src/components/forms/EditEventForm.js
@@ -34,11 +34,12 @@ class EditEventForm extends Component {
         open={this.state.showModal}
         trigger={
           <Button
-            compact
+            inverted
+            color='orange'
             onClick={() => { this.props.onClick();
                              this.setState({ showModal: true }); }}
-            size='mini'
           >
+            <Icon name='edit'/>
             Szerkeszt
           </Button>
         }
diff --git a/src/components/pages/Applications.js b/src/components/pages/Applications.js
index 934252c893eb21d80c7acb6e5de67805516bdb43..c91771ea45944650886168867532984c5957a6ef 100644
--- a/src/components/pages/Applications.js
+++ b/src/components/pages/Applications.js
@@ -79,7 +79,7 @@ class Applications extends Component {
           padding: '80px'
         }}
       >
-        <Table color='blue' celled selectable compact>
+        <Table color='blue' selectable compact>
           <Table.Header>
             <Table.Row>
               <Table.HeaderCell>Jelentkezettek</Table.HeaderCell>
diff --git a/src/components/pages/EventDetail.js b/src/components/pages/EventDetail.js
index 4c75171b9575939b03b97bf9d23282ead8f8aba6..3584835e846d6a5467b121c48f4a5962b15d9499 100644
--- a/src/components/pages/EventDetail.js
+++ b/src/components/pages/EventDetail.js
@@ -109,11 +109,11 @@ class EventDetail extends Component {
             ''
         }
         </Container>
-          <Table celled centered>
+          <Table centered>
             <Table.Header>
               <Table.Row>
                 <Table.HeaderCell>NĂŠv</Table.HeaderCell>
-                <Table.HeaderCell>Jelen volt</Table.HeaderCell>
+                <Table.HeaderCell textAlign='center'>Jelen volt</Table.HeaderCell>
                 <Table.HeaderCell>MegjegyzĂŠsek</Table.HeaderCell>
               </Table.Row>
             </Table.Header>
@@ -126,12 +126,16 @@ class EventDetail extends Component {
             </Table.Body>
           </Table>
           <Button
+            inverted
+            color='orange'
             onClick={() => this.setState({ edit: true })}
           >
           Szerkeszt
           </Button>
           { this.state.edit ?
             <Button
+              inverted
+              color='blue'
               onClick={() => {
                               this.setState({ edit: false });
                               this.props.submitVisitors(this.props.selectedEvent);
diff --git a/src/components/pages/Events.js b/src/components/pages/Events.js
index d5b6d30b8b3eb9f69ac2c3df9059accaa4feb5ee..4a06d79ec7adde46d0007411262b19df208376c3 100644
--- a/src/components/pages/Events.js
+++ b/src/components/pages/Events.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { Link } from 'react-router-dom';
-import { Container, Table, Button } from 'semantic-ui-react';
+import { Container, Table, Button, Icon } from 'semantic-ui-react';
 import { connect } from 'react-redux';
 import { getStaffEvents, deleteEvent, selectEventForEdit } from '../../actions/statistics';
 import AddEventForm from '../forms/AddEventForm';
@@ -24,21 +24,21 @@ class Events extends Component {
         </Table.Cell>
         <Table.Cell>{moment(event.date).format('LL')}</Table.Cell>
         <Table.Cell>{event.visitor_number}</Table.Cell>
-        <Table.Cell>
+        <Table.Cell textAlign='center'>
+          <EditEventForm onClick={() => this.props.selectEventForEdit(event)} />
           <ConfirmModal
             text={`törölni akarod a következő alkalmat:${event.name}`}
             button={
               <Button
-                compact
+                inverted
                 color='red'
-                size='mini'
               >
-              TĂśrlĂŠs
+                <Icon name='x' />
+                TĂśrlĂŠs
               </Button>
                }
             onAccept={() => this.props.deleteEvent(event)}
           />
-          <EditEventForm onClick={() => this.props.selectEventForEdit(event)} />
         </Table.Cell>
       </Table.Row>
     );
@@ -48,7 +48,7 @@ class Events extends Component {
   render() {
     return (
       <Container textAlign='center'>
-        <Table color='blue' celled selectable compact>
+        <Table color='blue' selectable compact>
           <Table.Header>
             <Table.Row>
               <Table.HeaderCell>Alkalom neve</Table.HeaderCell>
diff --git a/src/components/pages/Trainees.js b/src/components/pages/Trainees.js
index e49cc33900e5f54780cff2cd80c38f9db6da2bd3..0847eef0cfa27c1e1e6485a7c27034a0af94da00 100644
--- a/src/components/pages/Trainees.js
+++ b/src/components/pages/Trainees.js
@@ -43,7 +43,7 @@ class Trainees extends Component {
 
   renderTableHeader() {
     return (this.props.events.map(event => (
-      <Table.HeaderCell>
+      <Table.HeaderCell textAlign='center'>
         {event.name}
       </Table.HeaderCell>)));
   }
@@ -51,7 +51,7 @@ class Trainees extends Component {
   render() {
     return (
       <Container textAlign='center'>
-        <Table color='blue' celled selectable compact>
+        <Table color='blue' selectable compact>
           <Table.Header>
             <Table.Row>
               <Table.HeaderCell>Képződők</Table.HeaderCell>