diff --git a/src/Icons/bt_settings.png b/src/Icons/bt_settings.png
new file mode 100644
index 000000000..cd1dcbfc3
Binary files /dev/null and b/src/Icons/bt_settings.png differ
diff --git a/src/Icons/connection.png b/src/Icons/connection.png
index 66c4e7f5d..8ca174316 100644
Binary files a/src/Icons/connection.png and b/src/Icons/connection.png differ
diff --git a/src/Icons/filter.png b/src/Icons/filter.png
index bff8da3d6..5ebb6ce6e 100644
Binary files a/src/Icons/filter.png and b/src/Icons/filter.png differ
diff --git a/src/Icons/gear.png b/src/Icons/gear.png
new file mode 100644
index 000000000..7e338cad2
Binary files /dev/null and b/src/Icons/gear.png differ
diff --git a/src/Icons/star.png b/src/Icons/star.png
new file mode 100644
index 000000000..5bf532844
Binary files /dev/null and b/src/Icons/star.png differ
diff --git a/src/icons.qrc b/src/icons.qrc
index 42c11250a..363bb088a 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -24,6 +24,7 @@
Icons/style.png
Icons/wizard.png
Icons/password.png
+ Icons/gear.png
Icons/sphere2.png
Icons/smile.png
Icons/loading.png
@@ -41,6 +42,9 @@
Icons/subscribe.png
Icons/unsubscribe16.png
Icons/subscribe16.png
+ Icons/search32.png
+ Icons/bt_settings.png
+ Icons/star.png
Icons/flags/portugal.png
Icons/flags/france.png
Icons/flags/ukraine.png
diff --git a/src/optionsNG.ui b/src/optionsNG.ui
new file mode 100644
index 000000000..ce93cd9fe
--- /dev/null
+++ b/src/optionsNG.ui
@@ -0,0 +1,1583 @@
+
+ Dialog
+
+
+
+ 0
+ 0
+ 597
+ 560
+
+
+
+
+ 463
+ 389
+
+
+
+ Options -- qBittorrent
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+ -
+
+
+
+ Sans Serif
+ 12
+ 75
+ false
+ true
+ false
+ false
+
+
+
+ Preferences
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ QTabWidget::North
+
+
+ QTabWidget::Rounded
+
+
+ 0
+
+
+
+ 22
+ 22
+
+
+
+ Qt::ElideLeft
+
+
+
+ General
+
+
+ :/Icons/star.png
+
+
+
-
+
+
+ User interface settings
+
+
+
-
+
+
-
+
+
+ Language:
+
+
+
+ -
+
+
+ QComboBox::AdjustToContents
+
+
+ 0
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 6
+ true
+
+
+
+ <b>Note:</b> Changes will be applied after qBittorrent is restarted.
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
-
+
+
+ Visual style:
+
+
+
+ -
+
+
-
+
+ Plastique style (KDE like)
+
+
+ -
+
+ Cleanlooks style (Gnome like)
+
+
+ -
+
+ Motif style (Unix like)
+
+
+ -
+
+ CDE style (Common Desktop Environment like)
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Ask for confirmation on exit when download list is not empty
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ System tray icon
+
+
+
-
+
+
+ Disable system tray icon
+
+
+
+ -
+
+
+ Close to tray
+
+
+
+ -
+
+
+ Minimize to tray
+
+
+ false
+
+
+
+ -
+
+
+ Show notification balloons in tray
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ Preview program
+
+
+
-
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Media player:
+
+
+
+ -
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ Downloads
+
+
+ :/Icons/gear.png
+
+
+ -
+
+
+ Filesystem
+
+
+
-
+
+
+ Put downloads in this folder:
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+ -
+
+
+ Pre-allocate all files
+
+
+
+
+
+
+ -
+
+
+ When adding a torrent
+
+
+
-
+
+
+ Display torrent content and some options
+
+
+ true
+
+
+
+ -
+
+
+ Do not start download automatically
+
+
+
+
+
+
+ -
+
+
+ Directory watching
+
+
+
-
+
+
+ Automatically download torrents present in this folder:
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+ ...
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 557
+ 21
+
+
+
+
+
+
+
+
+ Connection
+
+
+ :/Icons/connection.png
+
+
+
+
+ 10
+ 9
+ 557
+ 426
+
+
+
+ -
+
+
-
+
+
+ Listening port
+
+
+
-
+
+
-
+
+
+ Port range:
+
+
+
+ -
+
+
+ 1000
+
+
+ 65525
+
+
+ 6881
+
+
+
+ -
+
+
+ to
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ 1000
+
+
+ 65525
+
+
+ 6889
+
+
+
+
+
+ -
+
+
+ Enable UPnP port mapping
+
+
+
+ -
+
+
+ Enable NAT-PMP port mapping
+
+
+
+
+
+
+ -
+
+
+ Global bandwidth limiting
+
+
+
-
+
+
-
+
+
-
+
+
+ Upload:
+
+
+ true
+
+
+
+ -
+
+
+ Download:
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ true
+
+
+
+
+
+ 1
+
+
+ 1000000
+
+
+ 50
+
+
+
+ -
+
+
+ KiB/s
+
+
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+
+
+
+ 1
+
+
+ 1000000
+
+
+ 1
+
+
+
+ -
+
+
+ KiB/s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Proxy Settings
+
+
+
-
+
+
-
+
+
+ Type:
+
+
+
+ -
+
+
-
+
+ (None)
+
+
+ -
+
+ HTTP
+
+
+ -
+
+ SOCKS5
+
+
+
+
+ -
+
+
+ false
+
+
+ Proxy:
+
+
+
+ -
+
+
+ false
+
+
+ 0.0.0.0
+
+
+ 15
+
+
+ QLineEdit::Normal
+
+
+
+ -
+
+
+ false
+
+
+ Port:
+
+
+
+ -
+
+
+ false
+
+
+ 65525
+
+
+ 8080
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 21
+ 29
+
+
+
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+ Authentication
+
+
+
+ -
+
+
-
+
+
-
+
+
+ false
+
+
+ Username:
+
+
+
+ -
+
+
+ false
+
+
+ Password:
+
+
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+
+
+
+ 1000
+
+
+ QLineEdit::Normal
+
+
+
+ -
+
+
+ false
+
+
+
+
+
+ 1000
+
+
+ QLineEdit::Password
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 110
+
+
+
+ Affected connections
+
+
+
+
+ 10
+ 20
+ 341
+ 22
+
+
+
+ Use proxy for connections to trackers
+
+
+ true
+
+
+
+
+
+ 10
+ 40
+ 341
+ 22
+
+
+
+ Use proxy for connections to regular peers
+
+
+ true
+
+
+
+
+
+ 10
+ 60
+ 341
+ 22
+
+
+
+ Use proxy for connections to web seeds
+
+
+ true
+
+
+
+
+
+ 10
+ 80
+ 341
+ 22
+
+
+
+ Use proxy for DHT messages
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ Bittorrent
+
+
+ :/Icons/bt_settings.png
+
+
+ -
+
+
+ Connections limit
+
+
+
-
+
+
-
+
+
+ Global maximum number of connections:
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ 8
+
+
+
+ 2
+
+
+ 2000
+
+
+ 500
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Maximum number of connections per torrent:
+
+
+ true
+
+
+
+ -
+
+
+
+ 8
+
+
+
+ 2
+
+
+ 2000
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Maximum number of upload slots per torrent:
+
+
+ true
+
+
+
+ -
+
+
+
+ 8
+
+
+
+ 500
+
+
+ 4
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Additional Bittorrent features
+
+
+
-
+
+
+ Enable DHT network (decentralized)
+
+
+ true
+
+
+
+ -
+
+
+ Enable Peer eXchange (PeX)
+
+
+ true
+
+
+
+ -
+
+
+ Enable Local Peer Discovery
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ Encryption:
+
+
+
+ -
+
+
-
+
+ Enabled
+
+
+ -
+
+ Forced
+
+
+ -
+
+ Disabled
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Share ratio settings
+
+
+
+
+ 11
+ 30
+ 535
+ 31
+
+
+
+
-
+
+
+ Desired ratio:
+
+
+
+ -
+
+
+ false
+
+
+
+ 8
+
+
+
+ Qt::AlignHCenter
+
+
+ 1
+
+
+ 1.000000000000000
+
+
+ 10.000000000000000
+
+
+ 0.100000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ 11
+ 67
+ 535
+ 31
+
+
+
+ -
+
+
+ Remove torrents when their ratio reaches:
+
+
+
+ -
+
+
+ false
+
+
+
+ 8
+
+
+
+ Qt::AlignHCenter
+
+
+ 1
+
+
+ 1.000000000000000
+
+
+ 10.000000000000000
+
+
+ 0.100000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
+
+
+ IP Filter
+
+
+ :/Icons/filter.png
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+ -
+
+
+ Activate IP Filtering
+
+
+
+ -
+
+
+ false
+
+
+ Filter Settings
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
-
+
+
+
+ 0
+ 171
+
+
+
+
+ Sans Serif
+ 8
+ 50
+ false
+ false
+ false
+ false
+
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ false
+
+
+
+ Start IP
+
+
+
+
+ End IP
+
+
+
+
+ Origin
+
+
+
+
+ Comment
+
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Add Range
+
+
+
+ -
+
+
+ Remove Range
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Filter file path:
+
+
+
+ -
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+