diff --git a/mainwindow.cc b/mainwindow.cc
index 72b184aa..d5fa7119 100644
--- a/mainwindow.cc
+++ b/mainwindow.cc
@@ -805,6 +805,13 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   ui.centralWidget->grabGesture( Gestures::GDPinchGestureType );
   ui.centralWidget->grabGesture( Gestures::GDSwipeGestureType );
 #endif
+
+  if( layoutDirection() == Qt::RightToLeft )
+  {
+    // Adjust button icons for Right-To-Left layout
+    navBack->setIcon( QIcon( ":/icons/next.png" ) );
+    navForward->setIcon( QIcon( ":/icons/previous.png" ) );
+  }
 }
 
 void MainWindow::ctrlTabPressed()
diff --git a/scanpopup.cc b/scanpopup.cc
index a4ea7828..baae09c5 100644
--- a/scanpopup.cc
+++ b/scanpopup.cc
@@ -57,6 +57,13 @@ ScanPopup::ScanPopup( QWidget * parent,
 {
   ui.setupUi( this );
 
+  if( layoutDirection() == Qt::RightToLeft )
+  {
+    // Adjust button icons for Right-To-Left layout
+    ui.goBackButton->setIcon( QIcon( ":/icons/next.png" ) );
+    ui.goForwardButton->setIcon( QIcon( ":/icons/previous.png" ) );
+  }
+
   mainStatusBar = new MainStatusBar( this );
 
   ui.queryError->hide();