[gnote] Fix note toolbar alignment and icon sizes

[Aurimas Černius <aurimasc src gnome org>]

commit e1f38a4b87d2cbd32fadb97f23e37d6e2fc69c8f
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Wed Jun 5 22:48:37 2013 +0300

    Fix note toolbar alignment and icon sizes
    
    Fixes Bug 701450.

 src/notebooks/notebooknoteaddin.cpp |    4 +++-
 src/notewindow.cpp                  |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/notebooks/notebooknoteaddin.cpp b/src/notebooks/notebooknoteaddin.cpp
index 21419e2..e3fe0f6 100644
--- a/src/notebooks/notebooknoteaddin.cpp
+++ b/src/notebooks/notebooknoteaddin.cpp
@@ -67,13 +67,15 @@ namespace notebooks {
   void NotebookNoteAddin::initialize_tool_button()
   {
     gint icon_size = 16;
-    gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &icon_size, NULL);
+    gtk_icon_size_lookup(GTK_ICON_SIZE_SMALL_TOOLBAR, &icon_size, NULL);
 
     Gtk::Grid *grid = manage(new Gtk::Grid);
     grid->attach(*manage(new Gtk::Image(
       IconManager::obj().get_icon(IconManager::NOTEBOOK, icon_size))),
                  0, 0, 1, 1);
     m_label_widget = manage(new Gtk::Label);
+    m_label_widget->set_vexpand(true);
+    m_label_widget->set_valign(Gtk::ALIGN_CENTER);
     grid->attach(*m_label_widget, 1, 0, 1, 1);
     m_toolButton = Gtk::manage(new gnote::utils::ToolMenuButton(*grid, m_menu));
     m_toolButton->set_tooltip_text(_("Place this note into a notebook"));
diff --git a/src/notewindow.cpp b/src/notewindow.cpp
index a9dc3ff..3efd680 100644
--- a/src/notewindow.cpp
+++ b/src/notewindow.cpp
@@ -374,7 +374,7 @@ namespace gnote {
   //
   Gtk::Grid *NoteWindow::make_toolbar()
   {
-    Gtk::IconSize icon_size = Gtk::IconSize::from_name(gtk_icon_size_get_name(GTK_ICON_SIZE_MENU));
+    Gtk::IconSize icon_size = Gtk::IconSize::from_name(gtk_icon_size_get_name(GTK_ICON_SIZE_SMALL_TOOLBAR));
 
     Gtk::Grid *grid = manage(new Gtk::Grid);
     int grid_col = 0;