diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9abb480..c59e7f3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,187 +1,183 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
             Chris Rizzitello - rizzitello@kde.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <dialogs/profilesdialog.h>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KXMLGUIFactory>
 #include <memory>
 #include <QFileDialog>
 #include <QHBoxLayout>
 #include <QSplitter>
 #include <QToolButton>
 #include <widgets/3dview/viewer3d.h>
 #include <widgets/atcoreinstancewidget.h>
 #include <widgets/gcodeeditorwidget.h>
 #include <widgets/videomonitorwidget.h>
 
 
 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent),
     ui(new Ui::MainWindow),
     m_currEditorView(nullptr),
     m_instances(new QTabWidget(this))
 {
     ui->setupUi(this);
     initWidgets();
     setupActions();
     connect(m_instances, &QTabWidget::tabCloseRequested, [this] (int index){
         QWidget *tempWidget= m_instances->widget(index);
         delete tempWidget;
 
         if(m_instances->count() == 1) {
             m_instances->setTabsClosable(false);
             m_instances->setMovable(false);
         }
     });
 
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
 }
 
 void MainWindow::initWidgets()
 {
 
     setupLateralArea();
     newAtCoreInstance();
 
     // View:
     // Sidebar, Sidevar Controls, Printer Tabs.
     // Sidevar Controls and Printer Tabs can be resized, Sidebar cant.
     auto *centralLayout = new QHBoxLayout();
     auto splitter = new QSplitter();
     splitter->addWidget(m_lateral.m_stack);
     splitter->addWidget(m_instances);
     centralLayout->addWidget(m_lateral.m_toolBar);
     centralLayout->addWidget(splitter);
     ui->centralwidget->setLayout(centralLayout);
 }
 void MainWindow::newAtCoreInstance()
 {
     auto newInstanceWidget = new AtCoreInstanceWidget();
     QString name = QString::number(m_instances->addTab(newInstanceWidget, i18n("Connect a printer")));
     newInstanceWidget->setObjectName(name);
     connect(this, &MainWindow::profilesChanged, newInstanceWidget, &AtCoreInstanceWidget::updateProfileData);
     connect(newInstanceWidget, &AtCoreInstanceWidget::connectionChanged, this, &MainWindow::atCoreInstanceNameChange);
 
     if(m_instances->count() > 1) {
         m_instances->setTabsClosable(true);
         m_instances->setMovable(true);
     }
 }
 // Move to LateralArea.
 void MainWindow::setupLateralArea()
 {
     m_lateral.m_toolBar = new QWidget();
     m_lateral.m_stack = new QStackedWidget();
     auto buttonLayout = new QVBoxLayout();
 
     auto setupButton = [this, buttonLayout](const QString& key, const QString& text, const QIcon& icon, QWidget *w) {
         auto *btn = new QPushButton(m_lateral.m_toolBar);
         btn->setToolTip(text);
         btn->setAutoExclusive(true);
         btn->setCheckable(true);
         btn->setIcon(icon);
-        btn->setIconSize(QSize(64,64));
+        btn->setIconSize(QSize(48,48));
         btn->setFlat(true);
         m_lateral.m_stack->addWidget(w);
         m_lateral.m_map[key] = {btn, w};
 
         buttonLayout->addWidget(btn);
         connect(btn, &QToolButton::toggled, [this, w](bool checked) {
             if (checked)
                 m_lateral.m_stack->setCurrentWidget(w);
         });
     };
 
     auto *gcodeEditor = new GCodeEditorWidget(this);
      connect(gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, [this](KTextEditor::View* view){
          guiFactory()->removeClient(m_currEditorView);
          guiFactory()->addClient(view);
          m_currEditorView = view;
      });
 
-    setupButton("3d",    i18n("&3D"), QIcon(":/icon/atelier"), new Viewer3D(this));
-    setupButton("gcode", i18n("&GCode"), QIcon(":/icon/atelier"), gcodeEditor);
-    setupButton("video", i18n("&Video"), QIcon(":/icon/atelier"), new VideoMonitorWidget(this));
+    setupButton("3d",    i18n("&3D"), QIcon::fromTheme("draw-cuboid", QIcon(":/icon/atelier")), new Viewer3D(this));
+    setupButton("gcode", i18n("&GCode"), QIcon::fromTheme("accessories-text-editor", QIcon(":/icon/atelier")), gcodeEditor);
+    setupButton("video", i18n("&Video"), QIcon::fromTheme("camera-web", QIcon(":/icon/atelier")), new VideoMonitorWidget(this));
     buttonLayout->addStretch();
     m_lateral.m_toolBar->setLayout(buttonLayout);
 }
 
 void MainWindow::setupActions()
 {
     // Actions for the Toolbar
     QAction *action;
     action = actionCollection()->addAction(QStringLiteral("open_gcode"));
+    action->setIcon(QIcon::fromTheme("document-open", style()->standardIcon(QStyle::SP_DirOpenIcon)));
     action->setText(i18n("&Open GCode"));
     connect(action, &QAction::triggered, this, &MainWindow::openFile);
 
     action = actionCollection()->addAction(QStringLiteral("new_instance"));
+    action->setIcon(QIcon::fromTheme("list-add", QIcon()));
     action->setText(i18n("&New Connection"));
     connect(action, &QAction::triggered, this, &MainWindow::newAtCoreInstance);
 
     action = actionCollection()->addAction(QStringLiteral("profiles"));
+    action->setIcon(QIcon::fromTheme("document-properties", QIcon()));
     action->setText(i18n("&Profiles"));
     connect(action, &QAction::triggered, [this] {
         std::unique_ptr<ProfilesDialog> pd(new ProfilesDialog);
         pd->exec();
         emit(profilesChanged());
     });
 
-    #ifdef Q_OS_LINUX
-    //only set icons from theme on linux
-        actionCollection()->action(QStringLiteral("profiles"))->setIcon(QIcon::fromTheme("emblem-favorite"));
-    #endif
-    //use style's standardIcon for the icons we can.
-    actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
-
     action = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
 
     setupGUI(Default, ":/atelierui");
 }
 
 void MainWindow::openFile()
 {
     QUrl fileName = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
                               QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
 
     if (!fileName.isEmpty()) {
 
         m_lateral.get<GCodeEditorWidget>("gcode")->loadFile(fileName);
         m_lateral.get<Viewer3D>("3d")->drawModel(fileName.toString());
 
         const int tabs = m_instances->count();
         m_openFiles.append(fileName);
 
         for(int i=0; i < tabs; ++i){
             auto instance = qobject_cast<AtCoreInstanceWidget*>(m_instances->widget(i));
             instance->setOpenFiles(m_openFiles);
         }
     }
 }
 
 void MainWindow::atCoreInstanceNameChange(const QString &name)
 {
     m_instances->setTabText(sender()->objectName().toInt(),name);
 }
diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp
index b5e1f95..ad41ab3 100644
--- a/src/widgets/atcoreinstancewidget.cpp
+++ b/src/widgets/atcoreinstancewidget.cpp
@@ -1,461 +1,463 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2017>
     Author: Lays Rodrigues - laysrodriguessilva@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "atcoreinstancewidget.h"
 #include "ui_atcoreinstancewidget.h"
 #include <QToolBar>
 #include <AtCore/SerialLayer>
 #include <AtCore/GCodeCommands>
 #include <KLocalizedString>
 #include "choosefiledialog.h"
 
 AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent):
     QWidget(parent),
     m_mainToolBar(nullptr),
     m_toolBar(nullptr),
     m_printAction(nullptr)
 {
     ui = new Ui::AtCoreInstanceWidget;
     ui->setupUi(this);
 
     ui->printProgressWidget->setVisible(false);
     buildMainToolbar();
     buildToolbar();
     buildConnectionToolbar();
     enableControls(false);
     updateProfileData();
     initConnectsToAtCore();
     m_mainToolBar->setHidden(true);
 }
 
 AtCoreInstanceWidget::~AtCoreInstanceWidget()
 {
     m_core.closeConnection();
     delete ui;
 }
 
 void AtCoreInstanceWidget::buildToolbar()
 {
     m_toolBar = new QToolBar();
 
     auto lb = new QAction;
-    lb->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
+    lb->setIcon(QIcon::fromTheme("go-home", style()->standardIcon(QStyle::SP_DirHomeIcon)));
     lb->setDisabled(true);
     m_toolBar->addAction(lb);
 
     auto homeAll = new QAction("All");
     connect(homeAll, &QAction::triggered, [this]{
        m_core.home();
     });
     m_toolBar->addAction(homeAll);
 
     for(auto homes : std::map<QString, int>{{"X", AtCore::X}, {"Y", AtCore::Y}, {"Z", AtCore::Z}}) {
         auto home = new QAction(homes.first);
         connect(home, &QAction::triggered, [this, homes] {
             m_core.home(homes.second);
         });
         m_toolBar->addAction(home);
     }
 
     m_toolBar->addSeparator();
 
     auto *axis = new QAction("Axis");
     axis->setCheckable(true);
     axis->setChecked(true);
     connect(axis, &QAction::toggled, ui->axisViewWidget, &AxisControl::setVisible);
 
     auto controls = new QAction("Controls");
     controls->setCheckable(true);
     controls->setChecked(true);
     connect(controls, &QAction::toggled, ui->bedExtWidget, &BedExtruderWidget::setVisible);
 
     auto plot = new QAction("Temperature Plot");
     plot->setCheckable(true);
     plot->setChecked(true);
     connect(plot, &QAction::toggled, ui->plotWidget, &PlotWidget::setVisible);
 
     m_toolBar->addAction(axis);
     m_toolBar->addAction(controls);
     m_toolBar->addAction(plot);
     ui->toolBarLayout->addWidget(m_toolBar);
     ui->toolBarLayout->addStretch();
 }
 
 void AtCoreInstanceWidget::buildMainToolbar(){
     m_mainToolBar = new QToolBar();
     m_mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
-    m_printAction = new QAction(style()->standardIcon(QStyle::SP_MediaPlay),i18n("Print"));
+    m_printAction = new QAction(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)),i18n("Print"));
     connect(m_printAction, &QAction::triggered, [ this ](){
         if(m_core.state() == AtCore::BUSY) {
             pausePrint();
             return;
         }
         if (m_core.state() == AtCore::IDLE){
             print();
         } else if (m_core.state() == AtCore::PAUSE) {
             m_core.resume();
         }
     });
     m_mainToolBar->addAction(m_printAction);
 
-    auto stopAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop),i18n("Stop"));
+    auto stopAction = new QAction(QIcon::fromTheme("media-playback-stop", style()->standardIcon(QStyle::SP_MediaStop)), i18n("Stop"));
     connect(stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint);
     connect(stopAction, &QAction::triggered, [this](){
         m_printAction->setText(i18n("Print"));
-        m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
+        m_printAction->setIcon(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)));
     });
     m_mainToolBar->addAction(stopAction);
 
     auto disableMotorsAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop),i18n("Disable Motors"));
     connect(disableMotorsAction, &QAction::triggered, this, &AtCoreInstanceWidget::disableMotors);
     m_mainToolBar->addAction(disableMotorsAction);
 
     ui->mainToolBarLayout->addWidget(m_mainToolBar);
 }
 
 void AtCoreInstanceWidget::buildConnectionToolbar()
 {
     m_connectToolBar = new QToolBar();
     m_comboPort = new QComboBox;
     m_comboPort->setEditable(true);
     QLabel *deviceLabel = new QLabel(i18n("Device"));
     QHBoxLayout *deviceLayout = new QHBoxLayout;
     deviceLayout->addWidget(deviceLabel);
     deviceLayout->addWidget(m_comboPort,100);
 
     m_comboProfile = new QComboBox;
     m_comboProfile->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed);
     QHBoxLayout *profileLayout = new QHBoxLayout;
     QLabel *profileLabel = new QLabel(i18n("Profile"));
     profileLayout->addWidget(profileLabel);
     profileLayout->addWidget(m_comboProfile,100);
 
     QHBoxLayout *connectLayout = new QHBoxLayout;
     connectLayout->addLayout(deviceLayout,50);
     connectLayout->addLayout(profileLayout,50);
 
     m_connectWidget = new QWidget();
     m_connectWidget->setLayout(connectLayout);
     m_connectToolBar->addWidget(m_connectWidget);
 
-    m_connectButton = new QPushButton(i18n("Connect"));
+    m_connectButton = new QPushButton(QIcon::fromTheme("network-connect", style()->standardIcon(QStyle::SP_DialogCloseButton)), i18n("Connect"));
     m_connectButton->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
     connect(this, &AtCoreInstanceWidget::disableDisconnect, m_connectButton, &QPushButton::setDisabled);
     connect(m_connectButton, &QPushButton::clicked, this, &AtCoreInstanceWidget::connectButtonClicked);
     ui->mainToolBarLayout->addWidget(m_connectToolBar);
     ui->mainToolBarLayout->addWidget(m_connectButton);
 
 }
 
 void AtCoreInstanceWidget::connectButtonClicked()
 {
     if(m_core.state() == AtCore::DISCONNECTED) {
         if (m_comboProfile->currentText().isEmpty()) {
             QMessageBox::critical(this, i18n("Error"), i18n("Please, create a profile to connect on Settings!"));
             return;
         }
 
         if (m_comboPort->currentText().isEmpty()) {
             QMessageBox::critical(this, i18n("Error"), i18n("Please, connect a serial device to continue!"));
             return;
         }
 
         //Get profile data before connecting.
         QString profile = m_comboProfile->currentText();
         m_settings.beginGroup("GeneralSettings");
         m_settings.beginGroup(profile);
         QMap<QString, QVariant> data;
         data["bps"] = m_settings.value(QStringLiteral("bps"), QStringLiteral("115200"));
         data["bedTemp"] = m_settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0"));
         data["hotendTemp"] = m_settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0"));
         data["firmware"] = m_settings.value(QStringLiteral("firmware"),QStringLiteral("Auto-Detect"));
         data["postPause"] = m_settings.value(QStringLiteral("postPause"),QStringLiteral(""));
         data["name"] = profile;
         m_settings.endGroup();
         m_settings.endGroup();
 
         //then connect
         m_core.initSerial(m_comboPort->currentText(), data["bps"].toInt());
         if(m_core.state() == AtCore::CONNECTING){
             profileData = data;
             QString fw = profileData["firmware"].toString();
             if( fw != QString("Auto-Detect")){
                 m_core.loadFirmwarePlugin(fw);
             }
             emit(connectionChanged(profileData["name"].toString()));
         }
     } else {
         m_core.closeConnection();
         emit(connectionChanged(i18n("Connect a Printer")));
     }
 }
 
 void AtCoreInstanceWidget::initConnectsToAtCore()
 {
     m_core.setSerialTimerInterval(100);
     // Handle device changes
     connect(&m_core, &AtCore::portsChanged, this, &AtCoreInstanceWidget::updateSerialPort);
 
     // Handle AtCore status change
     connect(&m_core, &AtCore::stateChanged, this, &AtCoreInstanceWidget::handlePrinterStatusChanged);
 
     // If the number of extruders from the printer change, we need to update the radiobuttons on the widget
     connect(this, &AtCoreInstanceWidget::extruderCountChanged, ui->bedExtWidget, &BedExtruderWidget::setExtruderCount);
 
     // Bed and Extruder temperatures management
     connect(ui->bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &m_core, &AtCore::setBedTemp);
     connect(ui->bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &m_core, &AtCore::setExtruderTemp);
 
     // Connect AtCore temperatures changes on Atelier Plot
     connect(&m_core.temperature(), &Temperature::bedTemperatureChanged, [ this ](const float& temp) {
         checkTemperature(0x00, 0, temp);
         ui->plotWidget->appendPoint(i18n("Actual Bed"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateBedTemp(temp);
     });
     connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](const float& temp) {
         checkTemperature(0x01, 0, temp);
         ui->plotWidget->appendPoint(i18n("Target Bed"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateBedTargetTemp(temp);
     });
     connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, [ this ](const float& temp) {
         checkTemperature(0x02, 0, temp);
         ui->plotWidget->appendPoint(i18n("Actual Ext.1"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateExtTemp(temp);
     });
     connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](const float& temp) {
         checkTemperature(0x03, 0, temp);
         ui->plotWidget->appendPoint(i18n("Target Ext.1"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateExtTargetTemp(temp);
     });
 
     connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ this ](QString command) {
         ui->logWidget->addLog("Push " + command);
         m_core.pushCommand(command);
     });
 
     // Fan, Flow and Speed management
     connect(ui->ratesControlWidget, &RatesControlWidget::fanSpeedChanged, &m_core, &AtCore::setFanSpeed);
     connect(ui->ratesControlWidget, &RatesControlWidget::flowRateChanged, &m_core, &AtCore::setFlowRate);
     connect(ui->ratesControlWidget, &RatesControlWidget::printSpeedChanged, &m_core, &AtCore::setPrinterSpeed);
     connect(ui->axisViewWidget, &AxisControl::clicked, this, &AtCoreInstanceWidget::axisControlClicked);
 }
 
 void AtCoreInstanceWidget::printFile(const QUrl& fileName)
 {
     if (!fileName.isEmpty() && (m_core.state() == AtCore::IDLE)) {
         m_core.print(fileName.toLocalFile());
     }
 }
 
 void AtCoreInstanceWidget::print(){
     switch (m_files.size()){
         case 0:
             QMessageBox::warning(this, i18n("Error"),
                                  i18n("There's no GCode File open. \n Please select a file and try again."),
                                  QMessageBox::Ok);
             break;
         case 1:
             printFile(m_files.at(0));
             break;
         default:
             auto dialog = new ChooseFileDialog(this, m_files);
             if(dialog->exec() == QDialog::Accepted){
                     printFile(dialog->choosenFile());
             }
     }
 }
 void AtCoreInstanceWidget::pausePrint()
 {
     if(m_core.state() == AtCore::BUSY) {
         m_core.pause(profileData["postPause"].toString());
     } else if (m_core.state() == AtCore::PAUSE) {
         m_core.resume();
     }
 }
 
 void AtCoreInstanceWidget::stopPrint()
 {
     m_core.stop();
 }
 
 void AtCoreInstanceWidget::disableMotors()
 {
     m_core.disableMotors(0);
 }
 
 void AtCoreInstanceWidget::handlePrinterStatusChanged(AtCore::STATES newState)
 {
     static QString stateString;
     switch (newState) {
         case AtCore::CONNECTING: {
             m_core.setSerialTimerInterval(0);
             m_connectButton->setText(i18n("Disconnect"));
+            m_connectButton->setIcon(QIcon::fromTheme("network-disconnect"));
             m_connectToolBar->setHidden(true);
             m_mainToolBar->setHidden(false);
             stateString = i18n("Connecting...");
             connect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand);
             connect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands);
         } break;
         case AtCore::IDLE: {
             stateString = i18n("Connected to ") + m_core.serial()->portName();
             emit extruderCountChanged(m_core.extruderCount());
             ui->logWidget->addLog(i18n("Serial connected"));
             emit disableDisconnect(false);
             enableControls(true);
         } break;
         case AtCore::DISCONNECTED: {
             stateString = i18n("Not Connected");
             disconnect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand);
             disconnect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands);
             ui->logWidget->addLog(i18n("Serial disconnected"));
             m_core.setSerialTimerInterval(100);
             m_connectButton->setText(i18n("Connect"));
+            m_connectButton->setIcon(QIcon::fromTheme("network-connect"));
             m_connectToolBar->setHidden(false);
             m_mainToolBar->setHidden(true);
             enableControls(false);
         } break;
         case AtCore::STARTPRINT: {
             stateString = i18n("Starting Print");
             ui->printProgressWidget->setVisible(true);
             connect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
         } break;
         case AtCore::FINISHEDPRINT: {
             stateString = i18n("Finished Print");
             ui->printProgressWidget->setVisible(false);
             disconnect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
             m_printAction->setText(i18n("Print"));
-            m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
+            m_printAction->setIcon(QIcon::fromTheme("document-edit", style()->standardIcon(QStyle::SP_MediaPlay)));
         } break;
         case AtCore::BUSY: {
             stateString = i18n("Printing");
             emit disableDisconnect(true);
             m_printAction->setText(i18n("Pause"));
-            m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
+            m_printAction->setIcon(QIcon::fromTheme("media-playback-pause", style()->standardIcon(QStyle::SP_MediaPause)));
         } break;
         case AtCore::PAUSE: {
             stateString = i18n("Paused");
             m_printAction->setText(i18n("Resume"));
-            m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
+            m_printAction->setIcon(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)));
         } break;
         case AtCore::STOP: {
             stateString = i18n("Stoping Print");
         } break;
         case AtCore::ERRORSTATE: {
             stateString = i18n("Error");
         } break;
         default:
           qWarning("AtCore State not Recognized.");
           break;
     }
      ui->lblState->setText(stateString);
 }
 
 void AtCoreInstanceWidget::checkTemperature(uint sensorType, uint number, uint temp)
 {
     static QString msg;
     switch (sensorType) {
     case 0x00: // bed
         msg = QString::fromLatin1("Bed Temperature ");
         break;
 
     case 0x01: // bed target
         msg = QString::fromLatin1("Bed Target Temperature ");
         break;
 
     case 0x02: // extruder
         msg = QString::fromLatin1("Extruder Temperature ");
         break;
 
     case 0x03: // extruder target
         msg = QString::fromLatin1("Extruder Target Temperature ");
         break;
 
     case 0x04: // enclosure
         msg = QString::fromLatin1("Enclosure Temperature ");
         break;
 
     case 0x05: // enclosure target
         msg = QString::fromLatin1("Enclosure Target Temperature ");
         break;
     }
 
     msg.append(QString::fromLatin1("[%1] : %2"));
     msg = msg.arg(QString::number(number))
           .arg(QString::number(temp));
 
     ui->logWidget->addRLog(msg);
 }
 
 void AtCoreInstanceWidget::checkReceivedCommand(const QByteArray &message)
 {
     ui->logWidget->addRLog(QString::fromUtf8(message));
 }
 
 void AtCoreInstanceWidget::checkPushedCommands(const QByteArray &bmsg)
 {
     QString msg = QString::fromUtf8(bmsg);
     QRegExp _newLine(QChar::fromLatin1('\n'));
     QRegExp _return(QChar::fromLatin1('\r'));
     msg.replace(_newLine, QStringLiteral("\\n"));
     msg.replace(_return, QStringLiteral("\\r"));
     ui->logWidget->addSLog(msg);
 }
 
 void AtCoreInstanceWidget::axisControlClicked(QChar axis, int value)
 {
   m_core.setRelativePosition();
   m_core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value))));
   m_core.setAbsolutePosition();
 }
 
 void AtCoreInstanceWidget::enableControls(bool b)
 {
     ui->mainTab->setEnabled(b);
     m_mainToolBar->setEnabled(b);
     m_toolBar->setEnabled(b);
 }
 
 bool AtCoreInstanceWidget::connected()
 {
     return (m_core.state() != AtCore::DISCONNECTED);
 }
 
 void AtCoreInstanceWidget::setOpenFiles(const QList<QUrl>& files)
 {
     m_files = files;
 }
 
 void AtCoreInstanceWidget::updateSerialPort(const QStringList &ports)
 {
     m_comboPort->clear();
     m_comboPort->addItems(ports);
 }
 
 void AtCoreInstanceWidget::updateProfileData()
 {
     m_settings.beginGroup("GeneralSettings");
     QStringList profiles = m_settings.childGroups();
     m_settings.endGroup();
     m_comboProfile->clear();
     m_comboProfile->addItems(profiles);
 }